From a6944dd859cdb37e57ece09281a187097585f65b Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Tue, 26 Feb 2019 23:24:06 +0100 Subject: [PATCH] Rename function add_month to first_of_month and add functionality do subtract a month. --- web/seepark_web.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/web/seepark_web.py b/web/seepark_web.py index 1ff5151..1a6c7c6 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//sensors/') @@ -365,7 +372,7 @@ def report(year, month): 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)) -- 2.47.3