From 5d2dc02dbd8661ddec68b39653dc05b74822fb62 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Thu, 30 Jan 2020 21:04:22 +0100
Subject: [PATCH] Add timestamp to the page for update info

---
 dashboard/generate.py              |   2 +
 dashboard/templates/dashboard.html | 131 ++++++++++++++++-------------
 2 files changed, 74 insertions(+), 59 deletions(-)
diff --git a/dashboard/generate.py b/dashboard/generate.py
index eb1d0b3f..d233a191 100644
--- a/dashboard/generate.py
+++ b/dashboard/generate.py
@@ -19,6 +19,7 @@ from openqa_client.client import OpenQA_Client
 from openqa_client.exceptions import ConnectionError, RequestError
 from urllib.error import HTTPError, URLError
 from urllib.parse import quote_plus
+from datetime import datetime
 
 import requests
 from osclib.PubSubConsumer import PubSubConsumer
@@ -144,5 +145,6 @@ if __name__ == '__main__':
     with app.app_context():
         rendered = render_template('dashboard.html',
             projectname = args.project,
+            lastupdate = datetime.now(),
             projects = fetcher.projects)
         print(rendered)
diff --git a/dashboard/templates/dashboard.html b/dashboard/templates/dashboard.html
index d2ec30a8..053b3a30 100644
--- a/dashboard/templates/dashboard.html
+++ b/dashboard/templates/dashboard.html
@@ -1,76 +1,89 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-  	<title>Dashboard for {{ projectname }}</title>
-  </head>
-  <body>
-	<h1>Dashboard for {{ projectname }}</h1>
-  <table class="table">
-    <thead>
+<head>
+  <!-- Required meta tags -->
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+  <title>Dashboard for {{ projectname }}</title>
+</head>
+
+<body>
+  <div class="container">
+    <div class="row">
+      <div class="h1 col text-left">Dashboard for {{ projectname }}</div>
+      <div class="col-3 text-right">Last update: <time class="timeago" datetime="{{lastupdate}}">{{ lastupdate }}</time></div>
+    </div>
+    <table class="table">
+      <thead>
+        <tr>
+          <th scope="col">Part</th>
+          <th scope="col">standard</th>
+          <th scope="col">images</th>
+          <th scope="col">source</th>
+          <th scope="col">testing</th>
+          <th scope="col">published</th>
+        </tr>
+      </thead>
+      {% for project in projects %}
       <tr>
-        <th scope="col">Part</th>
-        <th scope="col">standard</th>
-        <th scope="col">images</th>
-	<th scope="col">source</th>
-	<th scope="col">testing</th>
-	<th scope="col">published</th>
-      </tr>
-    </thead>
-    {% for project in projects %}
-    <tr>
-      <th scope="row"><a href="https://build.opensuse.org/project/show/{{ project.name }}">{{project.nick}}</a></th>
-      <td>
-        {% set progress = project.standard_progress() %}
-        {% if progress['building'] < 1000 %}
-          {{ progress['building'] / 10}}% done
-        {% else %}
-          done
-        {% endif %}
-        {% if progress['failed'] > 0 %}
-         , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_standard=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a>
-        {% endif %}
-        {% if progress['unresolvable'] > 0 %}
-         , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_standard=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a>
-        {% endif %}
-      </td>
-      <td>
-        {% set progress = project.images_progress() %}
-        {% if progress['building'] >= 0 %}
+        <th scope="row"><a href="https://build.opensuse.org/project/show/{{ project.name }}">{{project.nick}}</a></th>
+        <td>
+          {% set progress = project.standard_progress() %}
           {% if progress['building'] < 1000 %}
-            {{ progress['building'] / 10}}% done
+          {{ progress['building'] / 10}}% done
           {% else %}
-            done
+          done
           {% endif %}
           {% if progress['failed'] > 0 %}
-            , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_images=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a>
+          , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_standard=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a>
           {% endif %}
           {% if progress['unresolvable'] > 0 %}
-            , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_images=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a>
+          , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_standard=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a>
           {% endif %}
-        {% else %}
+        </td>
+        <td>
+          {% set progress = project.images_progress() %}
+          {% if progress['building'] >= 0 %}
+          {% if progress['building'] < 1000 %}
+          {{ progress['building'] / 10}}% done
+          {% else %}
+          done
+          {% endif %}
+          {% if progress['failed'] > 0 %}
+          , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_images=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a>
+          {% endif %}
+          {% if progress['unresolvable'] > 0 %}
+          , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_images=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a>
+          {% endif %}
+          {% else %}
           n.a.
-        {% endif %}
-      </td>
-      <td>
-        {{ project.ttm_version or 'n.a.' }}
-      </td>
-      <td>
-        {{ project.ttm_status.get('testing', 'n.a.') }}
-      </td>
-      <td>
-        {{ project.ttm_status.get('published', 'n.a.') }}
-      </td>
-    </tr>
-    {% endfor %}
-  </table>
+          {% endif %}
+        </td>
+        <td>
+          {{ project.ttm_version or 'n.a.' }}
+        </td>
+        <td>
+          {{ project.ttm_status.get('testing', 'n.a.') }}
+        </td>
+        <td>
+          {{ project.ttm_status.get('published', 'n.a.') }}
+        </td>
+      </tr>
+      {% endfor %}
+    </table>
+  </div>
   <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
   <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.6.7/jquery.timeago.min.js" integrity="sha256-0+5OfvOxkLHqpLPPwy9pDjug8N3cwaqcmleaxnR5VS8=" crossorigin="anonymous"></script>
+  <script>
+    jQuery(document).ready(function() {
+      jQuery("time.timeago").timeago();
+    });
+  </script>
+</body>
 
-  </body>
 </html>

Part	standard	images	source	testing	published
Part	standard	images	source	testing	published
{{project.nick}}	- {% set progress = project.standard_progress() %} - {% if progress['building'] < 1000 %} - {{ progress['building'] / 10}}% done - {% else %} - done - {% endif %} - {% if progress['failed'] > 0 %} - , {{ progress['failed'] }} failed - {% endif %} - {% if progress['unresolvable'] > 0 %} - , {{ progress['unresolvable'] }} unresolvable - {% endif %} -	- {% set progress = project.images_progress() %} - {% if progress['building'] >= 0 %} +	{{project.nick}}	+ {% set progress = project.standard_progress() %} {% if progress['building'] < 1000 %} - {{ progress['building'] / 10}}% done + {{ progress['building'] / 10}}% done {% else %} - done + done {% endif %} {% if progress['failed'] > 0 %} - , {{ progress['failed'] }} failed + , {{ progress['failed'] }} failed {% endif %} {% if progress['unresolvable'] > 0 %} - , {{ progress['unresolvable'] }} unresolvable + , {{ progress['unresolvable'] }} unresolvable {% endif %} - {% else %} +	+ {% set progress = project.images_progress() %} + {% if progress['building'] >= 0 %} + {% if progress['building'] < 1000 %} + {{ progress['building'] / 10}}% done + {% else %} + done + {% endif %} + {% if progress['failed'] > 0 %} + , {{ progress['failed'] }} failed + {% endif %} + {% if progress['unresolvable'] > 0 %} + , {{ progress['unresolvable'] }} unresolvable + {% endif %} + {% else %} n.a. - {% endif %} -	- {{ project.ttm_version or 'n.a.' }} -	- {{ project.ttm_status.get('testing', 'n.a.') }} -	- {{ project.ttm_status.get('published', 'n.a.') }} -