From 9dde795c125221bbe8a736f28f2c391ed80088cf Mon Sep 17 00:00:00 2001 From: terrtia Date: Fri, 6 Dec 2024 16:42:17 +0100 Subject: [PATCH] chg: [dashboard] show tracker description --- bin/lib/ail_stats.py | 3 +-- var/www/templates/dashboard/dashboard.html | 12 +++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bin/lib/ail_stats.py b/bin/lib/ail_stats.py index ca8d9149..abfa3c5d 100755 --- a/bin/lib/ail_stats.py +++ b/bin/lib/ail_stats.py @@ -44,8 +44,7 @@ def get_feeders_by_time(timestamp): # TODO def get_feeders_dashboard_full(): timestamp = get_current_feeder_timestamp(int(time.time())) - print(timestamp) - # timestamp = 1731491970 + # print(timestamp) f_dashboard = {} feeders = get_feeders() diff --git a/var/www/templates/dashboard/dashboard.html b/var/www/templates/dashboard/dashboard.html index abb2e129..0e3e6560 100644 --- a/var/www/templates/dashboard/dashboard.html +++ b/var/www/templates/dashboard/dashboard.html @@ -2,7 +2,7 @@ - Objects - AIL + AIL Framework @@ -152,7 +152,7 @@ {{ tracker['type'] }} - {{ tracker['tracked'] }} + {% if tracker['description'] %}{{ tracker['description'] }}{% else %}{{ tracker['tracked'] }}{% endif %} @@ -412,7 +412,13 @@ function update_tracked_objs_dashboard(data) { let tracker = data[elem]; var row = $(''); row.append('' + tracker['type'] + ''); - row.append('' + sanitize_text(tracker['tracked']) + ''); + let name; + if (tracker['description']) { + name = tracker['description']; + } else { + name = tracker['tracked']; + } + row.append('' + sanitize_text(name) + ''); ntd = $(''); row.append(create_obj_svg(ntd, tracker['obj']['gid'], tracker['obj']['link'], tracker['obj']['icon']['color'], tracker['obj']['icon']['style'], tracker['obj']['icon']['icon'])); row.append('' + tracker['timestamp'] + '');