From dc83842528360f9b51ca5ed103827b018c2d4c3e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Feb 2020 18:01:55 +0000
Subject: [PATCH] fireinfo: Show amount of active profiles

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/fireinfo/admin.html | 12 +++++++-----
 src/web/fireinfo.py               |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/templates/fireinfo/admin.html b/src/templates/fireinfo/admin.html
index 66269ba8..00a54425 100644
--- a/src/templates/fireinfo/admin.html
+++ b/src/templates/fireinfo/admin.html
@@ -6,12 +6,14 @@
 	<section>
 		<div class="container">
 			<div class="row">
-				<div class="col col-lg-8">
-					<h1 class="display-2">{{ "{:,d}".format(count) }}</h1>
+				<div class="col col-lg-6 text-center">
+					<h1>{{ "{:,d}".format(total) }}</h1>
+					<h4>{{ _("Total amount of profiles") }}</h4>
+				</div>
 
-					<p>
-						{{ _("Total amount of systems reporting back to Fireinfo") }}
-					</p>
+				<div class="col col-lg-6 text-center">
+					<h1>{{ "%.2f%%" % (with_data * 100 / total) }}</h1>
+					<h4>{{ _("Reporting back to us") }}</h4>
 				</div>
 			</div>
 		</div>
diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index a6a9858a..33fc5669 100644
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -296,6 +296,6 @@ class AdminIndexHandler(BaseHandler):
 
 	@tornado.web.authenticated
 	def get(self):
-		count = self.backend.fireinfo.get_profile_count()
+		with_data, total = self.backend.fireinfo.get_active_profiles()
 
-		self.render("fireinfo/admin.html", count=count)
+		self.render("fireinfo/admin.html", with_data=with_data, total=total)
-- 
2.39.2