diff --git a/src/flask/charts/BeerCharts.py b/src/flask/charts/BeerCharts.py index 3895067..3655e22 100644 --- a/src/flask/charts/BeerCharts.py +++ b/src/flask/charts/BeerCharts.py @@ -9,6 +9,9 @@ class BeerCharts(): def __init__(self): self.db = db_conn() + def bar_chart(self, items, data): + return 0 + def line_chart(self, title, field, limit): data = self.db.beer_db diff --git a/src/flask/table/table_builder.py b/src/flask/table/table_builder.py index 9b4201a..20df83b 100644 --- a/src/flask/table/table_builder.py +++ b/src/flask/table/table_builder.py @@ -24,24 +24,29 @@ class TableBuilder(): df_dict["final_reading"].append(record["final_reading"]) df = pd.DataFrame(data=df_dict) sql = f""" - SELECT x.beer_run_id as "Beer Run", - max(sg) as "Max", - min(sg) as "Min" + SELECT x.beer_run_id as beer_run_id, + max(sg) as max, + min(sg) as min, + y.date as final_reading_date FROM df x JOIN - ( SELECT DISTINCT beer_run_id + ( SELECT DISTINCT beer_run_id, date FROM df WHERE final_reading = 'True' ) y ON x.beer_run_id = y.beer_run_id - GROUP BY x.beer_run_id + GROUP BY x.beer_run_id, y.date ORDER BY x.beer_run_id desc LIMIT {limit} """ df_sum = duckdb.sql(sql).df() sql = f""" - SELECT *, - ROUND(((CAST (max AS INTEGER) - CAST(min AS INTEGER)) / 7.36) + 0.5, 2) AS "Alcohol Prediction" - FROM df_sum + SELECT x.beer_run_id as "Beer Run", + x.max as "Max", + x.min as "Min", + ROUND(((CAST (max AS INTEGER) - CAST(min AS INTEGER)) / 7.36) + 0.5, 2) AS "Alcohol Prediction", + cast(final_reading_date as DATE) + INTERVAL 14 DAY as "Ready Date" + + FROM df_sum x """ df_calc = duckdb.sql(sql).df() return df_calc