X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/1ca8e91ee09c73b2e082c3f248346899a258d744..738c56973d30c744d1be86fc318536b9393c5797:/web/seepark_web.py diff --git a/web/seepark_web.py b/web/seepark_web.py index 523e52d..00d122f 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -9,12 +9,6 @@ import flask.json from flask_sqlalchemy import SQLAlchemy, inspect -app_path = os.path.dirname(os.path.realpath(__file__)) -lib_path = os.path.join(app_path, '..') -sys.path.append(lib_path) -from seeparklib.openweathermap import openweathermap_json, OpenWeatherMapError - - # https://stackoverflow.com/a/37350445 def sqlalchemy_model_to_dict(model): return {c.key: getattr(model, c.key) @@ -46,7 +40,7 @@ config = configparser.ConfigParser() config.read(os.environ['SEEPARKINI']) apikey = config.get('openweathermap', 'apikey') cityid = config.get('openweathermap', 'cityid') -mainsensor = config.get('temperature', 'mainsensor') +mainsensor = config.get('webapp', 'mainsensor') app = Flask(__name__) app.json_encoder = JSONEncoder @@ -94,7 +88,7 @@ def select_sensordata(sensor_id, sensor_type, begin, end, mode): else: resolution = resolutions['year'] # TODO: filter out samples from 'result' - # something like + # something like # select to_seconds(datetime) DIV (60*60*24) as interval_id, min(datetime), max(datetime), min(temp), avg(temp), max(temp), count(temp) from openweathermap group by interval_id order by interval_id; return query.all()