From 8eb4271c0467d38f13abb32d5145c898215b7830 Mon Sep 17 00:00:00 2001
From: Yannik Schmidt <sheppy@atlantishq.de>
Date: Sun, 2 Jul 2023 23:03:01 +0200
Subject: [PATCH] update: improve visuals & status list

---
 server.py                   |  7 +++----
 static/site.css             |  4 ++++
 templates/overview.html     |  2 +-
 templates/service_info.html | 16 ++++++++++------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/server.py b/server.py
index b926e23..4610752 100755
--- a/server.py
+++ b/server.py
@@ -51,7 +51,7 @@ class Status(db.Model):
 
     def human_date(self):
         dt = datetime.datetime.fromtimestamp(self.timestamp)
-        return dt.strftime("%d-%m%-%y %H:%M")
+        return dt.strftime("%d. %B %Y at %H:%M")
 
 def buildReponseDict(status, service=None):
 
@@ -91,7 +91,6 @@ def overview():
             status_age         = datetime.datetime.now() - status_time_parsed
 
             # check service timeout #
-            print(service.timeout, service, service.token)
             timeout = datetime.timedelta(seconds=service.timeout)
             if status_age > timeout:
                 status.status = "WARNING"
@@ -134,10 +133,10 @@ def service_details():
     if service.owner and service.owner != user:
         return ("Services is not owned by {}".format(user))
 
-    status_list = db.session.query()
+    status_list = db.session.query(Status).filter(Status.service==service.service).all()
 
     return flask.render_template("service_info.html", service=service, flask=flask,
-                                    user=user)
+                                    user=user, status_list=status_list)
 
 
 @app.route("/entry-form", methods=["GET", "POST", "DELETE"])
diff --git a/static/site.css b/static/site.css
index b0cb7f0..75c13ce 100644
--- a/static/site.css
+++ b/static/site.css
@@ -68,6 +68,10 @@ body{
     color: pink;
 }
 
+.ok{
+    color: #5aff5a;
+}
+
 .warning{
     color: orange;
 }
diff --git a/templates/overview.html b/templates/overview.html
index 8944da8..9a37ee8 100644
--- a/templates/overview.html
+++ b/templates/overview.html
@@ -36,7 +36,7 @@
                     {% if status.timestamp == 0 %}
                     Service never reported in
                     {% else %}
-                    {{ datetime.fromtimestamp(status.timestamp).strftime("%H:%M on %d.%b.%y") }}
+                    {{ status.human_date() }}
                     {% endif %}
                     </small>
                 </a>
diff --git a/templates/service_info.html b/templates/service_info.html
index 3406cee..f5931e9 100644
--- a/templates/service_info.html
+++ b/templates/service_info.html
@@ -12,9 +12,11 @@
 
 			<div class="last-status">
 			{% if status_list | length > 0 %}
-			<p>{{ status_list[0].status }} submitted on {{ status_list[0].timestamp }}</i>
+			<p class="{{ status_list[0].status }}">
+				{{ status_list[0].status }} submitted on {{ status_list[0].human_date() }}
+			</p>
 			{% else %}
-			<p style="color: darkred;">No status for this service submitted</i>
+			<p style="color: darkred;">No status for this service submitted</p>
 			{% endif %}
 			</div>
 
@@ -58,11 +60,13 @@
 				<th>Info</th>
 			</thead>
 
-			<tbody>
+			<tbody class="mt-2">
 				{% for status in status_list %}
-					<td>status.human_date()<td>
-					<td>status.status</td>
-					<td>status.info</td>
+				<tr>
+                    <td>{{ status.human_date()  }}</td>
+					<td class="{{ status.status }}">{{ status.status }}</td>
+					<td>{{ status.info_text     }}</td>
+				</tr>
 				{% endfor %}
 			</tbody>
 			</table>