From 1008d3e2e445634c285bc50252e75db9630efea2 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Wed, 8 Jan 2020 23:51:16 +0000
Subject: [PATCH] implement home page status report feature.

---
 app/app.py                   |   5 ++++-
 app/models/devices.py        |   8 ++++----
 app/readings.db              | Bin 40960 -> 40960 bytes
 app/services/get_services.py |  14 ++++++++++++++
 app/templates/home.html      |  13 +++++++------
 5 files changed, 29 insertions(+), 11 deletions(-)

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 23ac2a8716c40d37eef376a4c1873bfc64d76b28..3c42e9242dce31415bc63c0fe1f0bf102191b304 100644
GIT binary patch
delta 391
zcmZoTz|?SnX@WGP%tRSyMwyKXOYB8B_}((`-{s%UKZC!FKZM_iUx4rJW<i0gd|Zkg
zEDVmqMg~R(lN<cSdD7Ap*nt9qPyq=p1vX?ZlLG7Hz5WVJ3M@cMaq>+6Y%XU08Bn8v
n26pjtDKeuQ$b@8q<m7w)a+CkWbI?~`J(>2Ar;o)fKP?RaXAxz9

delta 143
zcmZoTz|?SnX@WE(-$WT_M!t;+OYC`A_{$jh@AB{FpTS?YSx_L2pGkpb@?L+%$us@4
f*%<ln0wsaM=lLfFuuQ%iuTG3mJ*FxwLi3dY#g;Et

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 %}
 <main>
+  
   <div>
     
     <div class="header">
@@ -13,32 +14,32 @@
     <div class="status-bar">
       
       <div class="meter">
-	<img src="{{ url_for('static', filename='images/off.png') }}" alt="logo"/>
+	<img src="{{ url_for('static', filename='images/%s.png' % data["device 1"].status) }}" alt="logo"/>
 	<p>Factory 1</p>
       </div>
       
       <div class="meter">
-	<img src="{{ url_for('static', filename='images/off.png') }}" alt="logo"/>
+	<img src="{{ url_for('static', filename='images/%s.png' % data["device 2"].status) }}" alt="logo"/>
 	<p>Factory 2</p>
       </div>
 
       <div class="meter">
-	<img src="{{ url_for('static', filename='images/off.png') }}" alt="logo"/>
+	<img src="{{ url_for('static', filename='images/%s.png' % data["device 3"].status) }}" alt="logo"/>
 	<p>Factory 3</p>
       </div>
 
       <div class="meter">
-	<img src="{{ url_for('static', filename='images/off.png') }}" alt="logo"/>
+	<img src="{{ url_for('static', filename='images/%s.png' % data["device 4"].status) }}" alt="logo"/>
 	<p>Gallery 1</p>
       </div>
       
       <div class="meter">
-	<img src="{{ url_for('static', filename='images/off.png') }}" alt="logo"/>
+	<img src="{{ url_for('static', filename='images/%s.png' % data["device 5"].status) }}" alt="logo"/>
 	<p>Gallery 2</p>
       </div>
       
       <div class="meter">
-	<img src="{{ url_for('static', filename='images/off.png') }}" alt="logo"/>
+	<img src="{{ url_for('static', filename='images/%s.png' % data["device 6"].status) }}" alt="logo"/>
 	<p>Gallery 3</p>
       </div>