diff --git a/.gitignore b/.gitignore index 56c1acd..c770f86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *__pycache__* .venv* -.env +.env* mongo_data/* diff --git a/base.Dockerfile b/base.Dockerfile index 43f727a..9534f70 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 as pool_base_image +FROM python:3.10 AS pool_base_image WORKDIR /pool_data @@ -9,4 +9,3 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y libsasl2-dev p RUN pip install --upgrade pip RUN pip --default-timeout=1000 install -r requirements.txt - diff --git a/flask.Dockerfile b/flask.Dockerfile index bc06c42..38e7fb8 100644 --- a/flask.Dockerfile +++ b/flask.Dockerfile @@ -1,4 +1,4 @@ -FROM pool_base_image as flask +FROM pool_base_image AS flask COPY requirements.txt . diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..a578942 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[tool.pyright] +venvPath = "." +venv = ".venv" diff --git a/requirements.txt b/requirements.txt index e95fd0e..aaf30fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ click Flask-WTF bootstrap-flask waitress +bokeh diff --git a/src/flask/chart_test.py b/src/flask/chart_test.py index 6fe0b95..d30feaa 100644 --- a/src/flask/chart_test.py +++ b/src/flask/chart_test.py @@ -1,9 +1,10 @@ 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("data_plot.html") +output_file("static/data_plot.html") chart = PoolCharts.PoolCharts() @@ -13,4 +14,4 @@ total_chlorine = chart.line_chart("Pool Total Chlorine", "total_chlorine", 50) free_chlorine = chart.line_chart("Pool Free Chlorine", "free_chlorine", 50) -show(row(ph, total_chlorine, free_chlorine)) +show(column(ph, total_chlorine, free_chlorine)) diff --git a/src/flask/charts/PoolCharts.py b/src/flask/charts/PoolCharts.py index a193907..a15cd86 100644 --- a/src/flask/charts/PoolCharts.py +++ b/src/flask/charts/PoolCharts.py @@ -17,7 +17,7 @@ class PoolCharts(): data_list = [] date_count = {} for record in data: - if record[field] != "None": + if field in record and record[field] != "None": if record["date"] not in dates: print("new date record") dates.append(record["date"]) @@ -42,6 +42,8 @@ class PoolCharts(): p.line(x=dates, y=data_list) p.xgrid.grid_line_color = None - p.y_range.start = round(min(data_list) - 1) - + if not data_list: + p.y_range.start = 0 + else: + p.y_range.start = round(min(data_list) - 1) return p diff --git a/src/flask/data_plot.html b/src/flask/data_plot.html deleted file mode 100644 index 4cf5177..0000000 --- a/src/flask/data_plot.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Bokeh Plot - - - - - -
- - - - - \ No newline at end of file diff --git a/src/flask/pool_data.py b/src/flask/pool_data.py index b127ab4..3c9e2db 100644 --- a/src/flask/pool_data.py +++ b/src/flask/pool_data.py @@ -1,3 +1,4 @@ +from bokeh.core.enums import SpatialUnitsType import mongo.build_db as pool_database import mongo.query_db as pool_database_query @@ -7,6 +8,11 @@ from flask_bootstrap import Bootstrap5 from wtforms import StringField, SubmitField, DateField, IntegerField, PasswordField, DecimalField, RadioField, TextAreaField from wtforms.validators import DataRequired, Length, Optional from waitress import serve +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 app = Flask(__name__) app.secret_key = 'testsecret' #this value will change @@ -14,6 +20,21 @@ app.secret_key = 'testsecret' #this value will change bootstrap = Bootstrap5(app) csrf = CSRFProtect(app) +# used to configure the bokeh plot for graphs +output_file("/pool_data/src/flask/static/data_plot.html") + +def create_graphs(): + chart = PoolCharts.PoolCharts() + ph = chart.line_chart("Pool PH", "ph", 30) + total_chlorine = chart.line_chart("Pool Total Chlorine", "total_chlorine", 30) + free_chlorine = chart.line_chart("Pool Free Chlorine", "free_chlorine", 30) + alkalinity = chart.line_chart("Alkalinity", "alkalinity", 30) + salt = chart.line_chart("Salt", "salt", 30) + temp = chart.line_chart("Temperature", "temp", 30) + hardness = chart.line_chart("Hardness", "hardness", 30) + stabiliser = chart.line_chart("Stabiliser", "stabiliser", 30) + show(row(column(ph, total_chlorine, free_chlorine, temp), column(salt, alkalinity, hardness, stabiliser))) + class userForm(FlaskForm): username = StringField("User Name?", validators=[DataRequired()]) @@ -21,7 +42,7 @@ class userForm(FlaskForm): submit = SubmitField("Letsa GO!") class dataForm(FlaskForm): - test_user = RadioField("Tester:", + test_user = RadioField("Tester:", choices=[("Isabella"), ("Heather"), ("Ariah")]) Date = DateField("Date:") free_chlorine = IntegerField("Free Chlorine:", validators=[Optional()]) @@ -34,7 +55,7 @@ class dataForm(FlaskForm): temp = DecimalField("Water Temperature", validators=[Optional()]) comment = TextAreaField("Any Comments?", validators=[Optional()]) submit = SubmitField("Write it, Write it REAAAAAAL GOOOD") - + @app.route("/", methods=["GET","POST"]) def index(): form = userForm() @@ -54,7 +75,7 @@ def index(): def updater(): if 'logged_in' not in session: return redirect("/") - + create_graphs() query_db = pool_database_query.pool_query() query = query_db.get_top(10, "ph") form = dataForm() @@ -81,9 +102,9 @@ def updater(): if database.existing_record[field] != new_record[field]: database.update_re_record(database.existing_record["_id"], field, new_record[field]) else: - database.create_re_record(new_record["ph"], new_record["total_chlorine"], new_record["free_chlorine"], + database.create_re_record(new_record["ph"], new_record["total_chlorine"], new_record["free_chlorine"], new_record["alkalinity"], new_record["date"], new_record["test_user"], - new_record["temp"], new_record["hardness"], new_record["stabiliser"], + new_record["temp"], new_record["hardness"], new_record["stabiliser"], new_record["salt"], new_record["comment"]) @@ -102,9 +123,9 @@ def pool_data_update(): if database.existing_record[field] != new_record[field]: database.update_re_record(database.existing_record["_id"], field, new_record[field]) else: - database.create_re_record(new_record["ph"], new_record["total_chlorine"], new_record["free_chlorine"], + database.create_re_record(new_record["ph"], new_record["total_chlorine"], new_record["free_chlorine"], new_record["alkalinity"], new_record["date"], new_record["test_user"], - new_record["temp"], new_record["hardness"], new_record["stabiliser"], + new_record["temp"], new_record["hardness"], new_record["stabiliser"], new_record["salt"], new_record["comment"]) @@ -117,4 +138,3 @@ def user_detail(id): if __name__ == '__main__': #app.run(host='0.0.0.0') serve(app, host='0.0.0.0', port=5000, url_scheme='https') - diff --git a/src/flask/static/data_plot.html b/src/flask/static/data_plot.html new file mode 100644 index 0000000..d5d1fd7 --- /dev/null +++ b/src/flask/static/data_plot.html @@ -0,0 +1,61 @@ + + + + + Bokeh Plot + + + + + +
+ + + + + \ No newline at end of file diff --git a/src/flask/templates/base.html b/src/flask/templates/base.html index be59d47..f619e1c 100644 --- a/src/flask/templates/base.html +++ b/src/flask/templates/base.html @@ -1,30 +1,26 @@ - + - - - + + + - - {% block title %} - Let there Be Pool Data - {% endblock %} - + {% block title %} Let there Be Pool Data {% endblock %} - {{ bootstrap.load_css() }} + {{ bootstrap.load_css() }} - - - - -{% block content %} -{% endblock %} + {% block content %} {% endblock %} - - -{{ bootstrap.load_js() }} - + + {{ bootstrap.load_js() }} + diff --git a/src/flask/templates/updater.html b/src/flask/templates/updater.html index 4f34796..8c8c088 100644 --- a/src/flask/templates/updater.html +++ b/src/flask/templates/updater.html @@ -27,10 +27,10 @@ {{ render_form(form) }} - + + +
+
+ +
- - + + + {% endblock %} diff --git a/start_env b/start_env index 4657523..24424ac 100755 --- a/start_env +++ b/start_env @@ -1,4 +1,4 @@ -# /bin/bash +ou /bin/bash source .venv/bin/activate source .env