X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/4bfc7ad02abc6bb60d507f60fa783e84e03c8352..d782d33862c95ae0fd1c2b0f8cd75a9cbc2af95b:/web/seepark_web.py diff --git a/web/seepark_web.py b/web/seepark_web.py index a155ffc..c6ceffb 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -1,4 +1,6 @@ +import collections import datetime +import itertools import time import configparser import os @@ -59,6 +61,11 @@ def parse_datetime(date_str): return datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S') +def ntimes(it, n): + for v in it: + yield from itertools.repeat(v, n) + + def get_sqlalchemy_database_uri(config): user = config.get('database', 'user') pwd = config.get('database', 'password') @@ -125,6 +132,13 @@ def select_sensordata(sensor_id, sensor_type, begin, end): return query.all() +def sensordata_to_xy(sensordata): + sensordata = list(sensordata) + x = np.array([d.timestamp for d in sensordata]) + y = np.array([d.value for d in sensordata]) + return x, y + + def select_sensordata_grouped(sensor_id, sensor_type, begin, end): # determine resolution (interval in seconds for data points) resolution = calc_grouping_resolution(begin, end) @@ -154,6 +168,13 @@ def select_openweatherdata(cityid, begin, end): return query.all() +def openweatherdata_to_xy(openweatherdata): + openweatherdata = list(openweatherdata) + x = np.array([d.datetime for d in openweatherdata]) + y = np.array([d.temp for d in openweatherdata]) + return x, y + + def select_openweatherdata_grouped(cityid, begin, end): # determine resolution (interval in seconds for data points) resolution = calc_grouping_resolution(begin, end) @@ -171,6 +192,32 @@ def select_openweatherdata_grouped(cityid, begin, end): return query.all() +def estimate_swimmer_count(date): + return date.day + + +def select_swimmerdata(begin, end): + def report_times(begin, end): + d = begin + while d < end: + for t in [10, 15]: + a = datetime.datetime.combine(d.date(), datetime.time(t)) + if a >= d: + yield a + d += datetime.timedelta(days=1) + SwimmerData = collections.namedtuple('SwimmerData', ['datetime', 'count']) + for d in report_times(begin, end): + count = estimate_swimmer_count(d) + yield SwimmerData(d, count) + + +def swimmerdata_to_xy(swimmerdata): + swimmerdata = list(swimmerdata) + x = np.array([d.datetime for d in swimmerdata]) + y = np.array([d.count for d in swimmerdata]) + return x, y + + def convert_to_c3(result, id, field_x, field_y): c3result = defaultdict(list) for row in result: @@ -244,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/') @@ -260,10 +314,11 @@ def sensorid(version, sensor_id): """Return all data for a specific sensor URL parameters: - begin=, optional, format like "2018-05-19T21:07:53" - end=, optional, format like "2018-05-19T21:07:53" - mode=, optional. return all rows (default) or with lower resolution (for charts) - format=, optional. return result as returned by sqlalchemy (default) or formatted for c3.js + + * ``begin=``, optional, format like ``2018-05-19T21:07:53`` + * ``end=``, optional, format like ``2018-05-19T21:07:53`` + * ``mode=``, optional. return all rows (default) or with lower resolution (for charts) + * ``format=``, optional. return result as returned by sqlalchemy (default) or formatted for c3.js """ result = sensordata(sensor_id=sensor_id) return jsonify(result) @@ -274,10 +329,11 @@ def sensortype(version, sensor_type): """Return all data for a specific sensor type URL parameters: - begin=, optional, format like "2018-05-19T21:07:53" - end=, optional, format like "2018-05-19T21:07:53" - mode=, optional. return all rows (default) or with lower resolution (for charts) - format=, optional. return result as returned by sqlalchemy (default) or formatted for c3.js + + * ``begin=``, optional, format like ``2018-05-19T21:07:53`` + * ``end=``, optional, format like ``2018-05-19T21:07:53`` + * ``mode=``, optional. return all rows (default) or with lower resolution (for charts) + * ``format=``, optional. return result as returned by sqlalchemy (default) or formatted for c3.js """ result = sensordata(sensor_type=sensor_type) return jsonify(result) @@ -309,70 +365,95 @@ def currentwater(version): return jsonify({"value": value, "timestamp": timestamp}) -@app.route('/report/-') +@app.route('/report//') def report(year, 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) - data = list(select_sensordata(mainsensor, 'Wassertemperatur', begin, end)) - x = np.array([d.timestamp for d in data]) - y = np.array([d.value for d in data]) + 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)) + swimmer_data = swimmerdata_to_xy(select_swimmerdata(begin, end)) + + report_times = [datetime.time(10), datetime.time(15)] + report_data = {'Wasser': water_data, 'Luft': air_data} days_datetime = [] d = begin while d < end: days_datetime.append(d) d = d + datetime.timedelta(1) - days_str = [d.strftime('%d') for d in days_datetime] binary_pdf = io.BytesIO() with PdfPages(binary_pdf) as pdf: - a4 = (21./2.54, 29.7/2.54) - title = 'Seepark Wassertemperatur {} {}'.format(MONTH_DE[begin.month-1], begin.year) - report_times = [datetime.time(10), datetime.time(15)] + title = 'Seepark Obsteig {} {}'.format(MONTH_DE[begin.month-1], begin.year) - # table - plt.figure(figsize=a4) - columns = ['Datum'] + # graphic + plt.figure(figsize=paper_size) + report_colors = [] + for label, data in sorted(report_data.items(), reverse=True): + x, y = data + lines = plt.plot(x, y, label=label) + report_colors.append(lines[0].get_color()) + plt.xticks(days_datetime, [''] * len(days_datetime)) plt.ylabel('Temperatur in °C') + plt.axis(xmin=begin, xmax=end) + plt.legend() + plt.grid() + plt.title(title) + + # table + columns = [] + for d in days_datetime: + columns.append('{}.'.format(d.day)) + rows = [] + for label in sorted(report_data.keys(), reverse=True): + for t in report_times: + rows.append('{:02d}:{:02d} {} °C'.format(t.hour, t.minute, label)) for t in report_times: - columns.append('Wassertemperatur {} Uhr'.format(t.hour)) + rows.append('{:02d}:{:02d} Badende'.format(t.hour, t.minute)) cells = [] - for d in days_datetime: - cell = ['{}, {}. {}'.format(DAY_OF_WEEK_DE[d.weekday()], d.day, MONTH_DE[d.month-1])] + for label, data in sorted(report_data.items(), reverse=True): for t in report_times: + row_cells = [] + x, y = data + for d in days_datetime: + report_datetime = datetime.datetime.combine(d.date(), t) + closest_index = np.argmin(np.abs(x - report_datetime)) + if abs(x[closest_index] - report_datetime) > datetime.timedelta(hours=1): + cell = 'N/A' + else: + value = y[closest_index] + cell = '{:.1f}'.format(value) + row_cells.append(cell) + cells.append(row_cells) + for t in report_times: + row_cells = [] + x, y = swimmer_data + for d in days_datetime: report_datetime = datetime.datetime.combine(d.date(), t) closest_index = np.argmin(np.abs(x - report_datetime)) if abs(x[closest_index] - report_datetime) > datetime.timedelta(hours=1): - cell.append('N/A') + cell = 'N/A' else: - value = y[closest_index] - cell.append('{:.1f}° C'.format(value)) - cells.append(cell) - - ax = plt.gca() - ax.table(cellText=cells, colLabels=columns, - loc='upper left') - ax.axis('off') - plt.title(title) - plt.subplots_adjust(left=0.1, right=0.9) # do not cut row labels - pdf.savefig() - - # graphic - plt.figure(figsize=a4) - plt.plot(x, y) - plt.xticks(days_datetime, days_str, rotation='vertical') - plt.xlabel('Tag') - plt.axis(xmin=begin, xmax=end) - plt.grid() + cell = y[closest_index] + row_cells.append(cell) + cells.append(row_cells) + row_colors = list(ntimes(report_colors + ['w'], len(report_times))) + table = plt.table(cellText=cells, colLabels=columns, rowLabels=rows, rowColours=row_colors, loc='bottom') + table.scale(xscale=1, yscale=2) plt.title(title) + plt.subplots_adjust(left=0.15, right=0.97, bottom=0.3) # do not cut row labels pdf.savefig() pdf_info = pdf.infodict() pdf_info['Title'] = title pdf_info['Author'] = 'Chrisu Jähnl' - pdf_info['Subject'] = 'Wassertemperatur' - pdf_info['Keywords'] = 'Seepark Wassertemperatur' + pdf_info['Subject'] = 'Temperaturen' + pdf_info['Keywords'] = 'Seepark Obsteig' pdf_info['CreationDate'] = datetime.datetime.now() pdf_info['ModDate'] = datetime.datetime.today() @@ -386,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', @@ -394,4 +477,6 @@ def index(): watertime=watertime, airvalue=airvalue, airtime=airtime, + this_month=this_month, + last_month=last_month )