From 7e427a6a8032497efab361369e829a41c782f553 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sun, 12 Jan 2025 12:42:14 -0500 Subject: [PATCH] Cleaned up eibi/repeaterbook status display. --- owrx/controllers/services.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/owrx/controllers/services.py b/owrx/controllers/services.py index 90e5b4a4..5ddfecc0 100644 --- a/owrx/controllers/services.py +++ b/owrx/controllers/services.py @@ -32,8 +32,10 @@ class ServiceController(AuthorizationMixin, WebpageController): Frequency {services} + + {status} + - {status} """.format( services="".join(ServiceController.renderService(c) for c in Services.listAll()), status=ServiceController.renderStatus() @@ -45,16 +47,16 @@ class ServiceController(AuthorizationMixin, WebpageController): ts = Repeaters.lastDownloaded() if ts > 0: ts = datetime.fromtimestamp(ts).strftime("%H:%M:%S, %m/%d/%Y") - result += "
Repeaters database downloaded at {0}.
\n".format(ts) + result += "
Repeaters database downloaded at {0}.
\n".format(ts) else: - result += "
Repeaters database not downloaded.
\n" + result += "
Repeaters database not downloaded.
\n" ts = EIBI.lastDownloaded() if ts > 0: ts = datetime.fromtimestamp(ts).strftime("%H:%M:%S, %m/%d/%Y") - result += "
Shortwave schedule downloaded at {0}.
\n".format(ts) + result += "
Shortwave schedule downloaded at {0}.
\n".format(ts) else: - result += "
Shortwave schedule not downloaded.
\n" - return "

\n" + result + "

\n" + result += "
Shortwave schedule not downloaded.
\n" + return result @staticmethod def renderService(c):