Merge pull request #1 from jolene-lim/master

timeline tool

main.py

@@ -1,10 +1,9 @@
-import configparser
-import os
-from datetime import date
-
+from flask import Flask, render_template, request, redirect, url_for
 from elasticsearch import Elasticsearch
-from flask import Flask, render_template, request
-
+import json
+import pandas as pd
+import configparser
+from datetime import date, timedelta
 from wrangle import wrangle
 
 app = Flask(__name__)
@@ -13,16 +12,12 @@
 def get_data():
     config = configparser.ConfigParser()
     config.read('config.ini')
-
-    host = os.environ.get('ELASTICSEARCH_HOST')
-    if host is None:
-        host = 'https://{}:{}@40ad140d461d810ac41ed710b5c7a5b6.us-west-2.aws.found.io:9243/'.format(config['ELASTICSEARCH']['Username'], config['ELASTICSEARCH']['Password'])
-    es = Elasticsearch(host)
+    es = Elasticsearch('https://{}:{}@40ad140d461d810ac41ed710b5c7a5b6.us-west-2.aws.found.io:9243/'.format(config['ELASTICSEARCH']['Username'], config['ELASTICSEARCH']['Password']))
 
     # query
-    today = date.today()
-    today = today.strftime('%Y-%m-%d')
-    raw = es.search(index='', body= {'from': 0, 'size': 10000, 'query': {'bool': {'must': [{'range': {'when_captured': {'gte': '2020-08-31', 'format': 'yyyy-MM-dd'}}}, {'range': {'loc_lat': {'gte': 33, 'lte': 34.5}}}, {'range': {'loc_lon': {'gte': -118.5, 'lte': -117}}}, {'match': {'device_class': 'safecast'}}, {'exists': {'field': 'pms_pm02_5'}}]}}}, _source=['device', 'when_captured', 'loc_lat', 'loc_lon', 'pms_pm01_0', 'pms_pm02_5', 'pms_pm10_0'])
+    week_ago = date.today() - timedelta(days=7)
+    week_ago = week_ago.strftime('%Y-%m-%d')
+    raw = es.search(index='', body= {'from': 0, 'size': 10000, 'query': {'bool': {'must': [{'range': {'when_captured': {'gte': week_ago, 'format': 'yyyy-MM-dd'}}}, {'range': {'loc_lat': {'gte': 34, 'lte': 34.5}}}, {'range': {'loc_lon': {'gte': -118.5, 'lte': -117.5}}}, {'exists': {'field': 'pms_pm02_5'}}]}}}, _source=['device', 'when_captured', 'loc_lat', 'loc_lon', 'pms_pm01_0', 'pms_pm02_5', 'pms_pm10_0'])
     # full
     full = [ms['_source'] for ms in raw['hits']['hits']]
     full_sort = wrangle.sort_time(full)
@@ -52,16 +47,5 @@ def filter():
 
     return render_template('map.html', data=data)
 
-@app.route("/agg", methods=['POST'])
-def agg():
-    type = request.form.get("aggDropdown")
-    """
-    if type == 'avg':
-        pass
-    else if type == 'max':
-        pass
-    """
-    return render_template('map.html', data=data)
-
 if __name__ == "__main__":
-    app.run(debug=True)
+    app.run(debug=True)