diff --git a/app/app.py b/app/app.py index 74dc000..2d39258 100644 --- a/app/app.py +++ b/app/app.py @@ -1,6 +1,7 @@ from flask import Flask, render_template import connexion import config +from services import get_services # The application instance. app = config.connex_app @@ -10,7 +11,9 @@ app.add_api("swagger.yml") @app.route("/") def home (): - return render_template("home.html") + data = get_services.get_latest_status_for_all_devices() + print(data) + return render_template("home.html", data=data) @app.route("/robots.txt") @app.route("/robots") diff --git a/app/models/devices.py b/app/models/devices.py index 25c2c35..4b30f1a 100644 --- a/app/models/devices.py +++ b/app/models/devices.py @@ -45,7 +45,7 @@ class Device3(db.Model): class Device3Schema(ma.ModelSchema): class Meta: - model = Device1 + model = Device3 sqla_session = db.session class Device4(db.Model): @@ -56,7 +56,7 @@ class Device4(db.Model): class Device4Schema(ma.ModelSchema): class Meta: - model = Device1 + model = Device4 sqla_session = db.session class Device5(db.Model): @@ -67,7 +67,7 @@ class Device5(db.Model): class Device5Schema(ma.ModelSchema): class Meta: - model = Device1 + model = Device5 sqla_session = db.session class Device6(db.Model): @@ -78,5 +78,5 @@ class Device6(db.Model): class Device6Schema(ma.ModelSchema): class Meta: - model = Device1 + model = Device6 sqla_session = db.session diff --git a/app/readings.db b/app/readings.db index 23ac2a8..3c42e92 100644 Binary files a/app/readings.db and b/app/readings.db differ diff --git a/app/services/get_services.py b/app/services/get_services.py index 98b3643..5929fb0 100644 --- a/app/services/get_services.py +++ b/app/services/get_services.py @@ -72,6 +72,9 @@ def get_all_status_logs_from_table(device): def get_all_status_changes_from_database(): return get_all_status_logs() +def get_latest_status_for_all_devices(): + return get_all_latest_logs() + ''' The Nitty-Gritty Functions ====================================================================== @@ -198,3 +201,14 @@ def get_all_status_changes_from_database(): logs = {"device 1": d1, "device 2": d2, "device 3": d3, "device 4": d4, "device 5": d5, "device 6": d6} return logs + +def get_all_latest_logs(): + d1 = get_d1_latest() + d2 = get_d2_latest() + d3 = get_d3_latest() + d4 = get_d4_latest() + d5 = get_d5_latest() + d6 = get_d6_latest() + logs = {"device 1": d1, "device 2": d2, "device 3": d3, + "device 4": d4, "device 5": d5, "device 6": d6} + return logs diff --git a/app/templates/home.html b/app/templates/home.html index c0a70e4..4ff8af3 100644 --- a/app/templates/home.html +++ b/app/templates/home.html @@ -1,6 +1,7 @@ {% extends "layout.html" %} {% block content %}
+
@@ -13,32 +14,32 @@
- logo + logo

Factory 1

- logo + logo

Factory 2

- logo + logo

Factory 3

- logo + logo

Gallery 1

- logo + logo

Gallery 2

- logo + logo

Gallery 3