X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/62f9135200a07a7c45dd0e966a9477da7c8486ea..d782d33862c95ae0fd1c2b0f8cd75a9cbc2af95b:/web/seepark_web.py

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 890e681..c6ceffb 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -291,8 +291,15 @@ def currentwatertemperature(sensorid):
     return result.value, result.timestamp
 
 
-def add_month(date):
-    return (date + datetime.timedelta(days=42)).replace(day=1)
+def first_of_month(date, month):
+    date = date.replace(day=1)
+    if month == 0:
+        return date
+    if month == 1:
+        return (date + datetime.timedelta(days=42)).replace(day=1)
+    if month == -1:
+        return (date - datetime.timedelta(days=1)).replace(day=1)
+    assert False
 
 
 @app.route('/api/<version>/sensors/')
@@ -307,10 +314,11 @@ def sensorid(version, sensor_id):
     """Return all data for a specific sensor
 
     URL parameters:
-    begin=<datetime>, optional, format like "2018-05-19T21:07:53"
-    end=<datetime>, optional, format like "2018-05-19T21:07:53"
-    mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
-    format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
+
+    * ``begin=<datetime>``, optional, format like ``2018-05-19T21:07:53``
+    * ``end=<datetime>``, optional, format like ``2018-05-19T21:07:53``
+    * ``mode=<full|consolidated>``, optional. return all rows (default) or with lower resolution (for charts)
+    * ``format=<default|c3>``, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
     result = sensordata(sensor_id=sensor_id)
     return jsonify(result)
@@ -321,10 +329,11 @@ def sensortype(version, sensor_type):
     """Return all data for a specific sensor type
 
     URL parameters:
-    begin=<datetime>, optional, format like "2018-05-19T21:07:53"
-    end=<datetime>, optional, format like "2018-05-19T21:07:53"
-    mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
-    format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
+
+    * ``begin=<datetime>``, optional, format like ``2018-05-19T21:07:53``
+    * ``end=<datetime>``, optional, format like ``2018-05-19T21:07:53``
+    * ``mode=<full|consolidated>``, optional. return all rows (default) or with lower resolution (for charts)
+    * ``format=<default|c3>``, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
     result = sensordata(sensor_type=sensor_type)
     return jsonify(result)
@@ -356,14 +365,14 @@ def currentwater(version):
     return jsonify({"value": value, "timestamp": timestamp})
 
 
-@app.route('/report/<int:year>/<int:month>')
+@app.route('/report/<int(fixed_digits=4):year>/<int(fixed_digits=2):month>')
 def report(year, month):
-    """Report for given year and month
+    """Report for given year (4 digits) and month (2 digits)
     """
     paper_size = (29.7 / 2.54, 21. / 2.54)  # A4
 
     begin = datetime.datetime(year, month, 1)
-    end = add_month(begin)
+    end = first_of_month(begin, 1)
 
     water_data = sensordata_to_xy(select_sensordata(mainsensor, 'Wassertemperatur', begin, end))
     air_data = openweatherdata_to_xy(select_openweatherdata(cityid, begin, end))
@@ -458,6 +467,8 @@ def report(year, month):
 def index():
     airvalue, airtime     = currentairtemperature(cityid)
     watervalue, watertime = currentwatertemperature(mainsensor)
+    this_month = first_of_month(datetime.date.today(), 0)
+    last_month = first_of_month(this_month, -1)
 
     return render_template(
         'seepark_web.html',
@@ -466,4 +477,6 @@ def index():
         watertime=watertime,
         airvalue=airvalue,
         airtime=airtime,
+        this_month=this_month,
+        last_month=last_month
     )