From 4371f3dadb58504b47fbb03d9c4183f7eec54edf Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Tue, 13 May 2025 21:38:33 +0200 Subject: [PATCH] S allius/issue396 (#412) * add title to table icons * optimize datetime formatting * change icons * translate n/a --- app/src/web/conn_table.py | 21 +++++++++++---------- app/src/web/mqtt_table.py | 7 +++++-- app/src/web/templates/page_mqtt.html.j2 | 6 +++--- app/translations/de/LC_MESSAGES/messages.po | 6 +++++- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/app/src/web/conn_table.py b/app/src/web/conn_table.py index 4b81868..35d221d 100644 --- a/app/src/web/conn_table.py +++ b/app/src/web/conn_table.py @@ -10,39 +10,40 @@ from .log_handler import LogHandler def _get_device_icon(client_mode: bool): '''returns the icon for the device conntection''' if client_mode: - return 'fa-download fa-rotate-180' + return 'fa-download fa-rotate-180', 'Server Mode' - return 'fa-upload fa-rotate-180' + return 'fa-upload fa-rotate-180', 'Client Mode' def _get_cloud_icon(emu_mode: bool): '''returns the icon for the cloud conntection''' if emu_mode: - return 'fa-cloud-arrow-up-alt' + return 'fa-cloud-arrow-up-alt', 'Emu Mode' - return 'fa-cloud' + return 'fa-cloud', 'Proxy Mode' def _get_row(inv: InverterBase): '''build one row for the connection table''' client_mode = inv.client_mode inv_serial = inv.local.stream.inv_serial - icon1 = _get_device_icon(client_mode) + icon1, descr1 = _get_device_icon(client_mode) ip1, port1 = inv.addr icon2 = '' + descr2 = '' ip2 = '--' port2 = '--' if inv.remote.ifc: ip2, port2 = inv.remote.ifc.r_addr - icon2 = _get_cloud_icon(client_mode) + icon2, descr2 = _get_cloud_icon(client_mode) row = [] - row.append(f' {ip1}:{port1}') - row.append(f' {ip1}') + row.append(f' {ip1}:{port1}') + row.append(f' {ip1}') row.append(inv_serial) - row.append(f' {ip2}:{port2}') - row.append(f' {ip2}') + row.append(f' {ip2}:{port2}') + row.append(f' {ip2}') return row diff --git a/app/src/web/mqtt_table.py b/app/src/web/mqtt_table.py index 8370c17..8530ef3 100644 --- a/app/src/web/mqtt_table.py +++ b/app/src/web/mqtt_table.py @@ -46,10 +46,13 @@ def get_table_data(): @web.route('/mqtt-fetch') async def mqtt_fetch(): mqtt = Mqtt(None) - ctime = format_datetime(dt=mqtt.ctime, format='short') + cdatetime = format_datetime(dt=mqtt.ctime, format='d.MM. HH:mm') data = { "update-time": format_datetime(format="medium"), - "mqtt-ctime": f"