diff --git a/requirements.txt b/requirements.txt index aaf30fa..85a7cae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ Flask-WTF bootstrap-flask waitress bokeh +pandas diff --git a/src/flask/beer_data.py b/src/flask/beer_data.py index 871c192..f294de3 100644 --- a/src/flask/beer_data.py +++ b/src/flask/beer_data.py @@ -62,7 +62,7 @@ def index(): def updater(): if 'logged_in' not in session: return redirect("/") - create_graphs() + #create_graphs() query_db = beer_database_query.pool_query() query = query_db.get_top(10, "sg") form = dataForm() diff --git a/src/flask/chart_test.html b/src/flask/chart_test.html deleted file mode 100644 index 0ce9862..0000000 --- a/src/flask/chart_test.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Bokeh Plot - - - - - -
- - - - - \ No newline at end of file diff --git a/src/flask/chart_test.py b/src/flask/chart_test.py deleted file mode 100644 index d30feaa..0000000 --- a/src/flask/chart_test.py +++ /dev/null @@ -1,17 +0,0 @@ -from bokeh.models.layouts import HBox -from bokeh.plotting import column -from charts import PoolCharts -from bokeh.io import output_file, show -from bokeh.layouts import row - -output_file("static/data_plot.html") - -chart = PoolCharts.PoolCharts() - -ph = chart.line_chart("Pool PH", "ph", 50) - -total_chlorine = chart.line_chart("Pool Total Chlorine", "total_chlorine", 50) - -free_chlorine = chart.line_chart("Pool Free Chlorine", "free_chlorine", 50) - -show(column(ph, total_chlorine, free_chlorine)) diff --git a/src/flask/table/__init__.py b/src/flask/table/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/flask/table/table_builder.py b/src/flask/table/table_builder.py new file mode 100644 index 0000000..4be46b4 --- /dev/null +++ b/src/flask/table/table_builder.py @@ -0,0 +1,29 @@ +import sys + +from mongo.get_conn import db_conn +import pandas as pd + +class TableBuilder(): + def __init__(self) -> None: + self.db = db_conn() + + def table_build(self, field, read_count=3, runs=5) -> pd.DataFrame: + data = self.db.beer_db + data = data.find({}).sort("date", -1) + df_dict = {} + df_dict["beer_run_id"]=[] + df_dict["sg"] = [] + df_dict["date"] = [] + df_dict["final_reading"] = [] + + for record in data: + df_dict["beer_run_id"].append(record["beer_run_id"]) + df_dict["sg"].append(record["sg"]) + df_dict["date"].append(record["date"]) + df_dict["final_reading"].append(record["final_reading"]) + + df = pd.DataFrame(data=df_dict) + df_sum = df.groupby('beer_run_id').agg({'sg': ['max', 'min']}) + return df_sum + + diff --git a/src/flask/templates/updater.html b/src/flask/templates/updater.html index 52e8f57..09d0d63 100644 --- a/src/flask/templates/updater.html +++ b/src/flask/templates/updater.html @@ -49,7 +49,7 @@
-
diff --git a/src/flask/test.py b/src/flask/test.py new file mode 100644 index 0000000..562a65e --- /dev/null +++ b/src/flask/test.py @@ -0,0 +1,5 @@ +import table.table_builder as table_builder + +test = table_builder.TableBuilder() + +print(test.table_build("sg"))