From 25a2bd7f2dcb7cb8434b9260cbf25b7044a9431d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Sat, 28 Oct 2023 21:15:13 +0200
Subject: [PATCH] render range result msg

---
 .../templates/control/mesh_messages.html      | 28 +++++++++++--------
 src/c3nav/control/templatetags/__init__.py    |  0
 src/c3nav/control/templatetags/mesh_node.py   | 20 +++++++++++++
 src/c3nav/control/views/mesh.py               |  1 +
 src/c3nav/mesh/dataformats.py                 |  3 +-
 5 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 src/c3nav/control/templatetags/__init__.py
 create mode 100644 src/c3nav/control/templatetags/mesh_node.py

diff --git a/src/c3nav/control/templates/control/mesh_messages.html b/src/c3nav/control/templates/control/mesh_messages.html
index 5825ec79..225d4c78 100644
--- a/src/c3nav/control/templates/control/mesh_messages.html
+++ b/src/c3nav/control/templates/control/mesh_messages.html
@@ -1,5 +1,5 @@
 {% extends 'control/base.html' %}
-{% load i18n %}
+{% load i18n mesh_node %}
 
 {% block heading %}{% trans 'Mesh messages' %}{% endblock %}
 
@@ -31,7 +31,7 @@
         {% for msg in mesh_messages %}
             <tr>
                 <td>{{ msg.datetime.date }} {{ msg.datetime.time|date:"H:i:s" }}</td>
-                <td><a href="{% url "control.mesh.node.detail" pk=msg.src_node.address %}">{{ msg.src_node }}</a></td>
+                <td>{% mesh_node msg.src_node %}</td>
                 <td>{{ msg.get_message_type_display }}</td>
                 <td>
 
@@ -82,18 +82,25 @@
                         </ul>
 
                     {% elif msg.message_type == "LOCATE_RANGE_RESULTS" %}
-                        <strong>ranges:</strong><br>
-                        <ul style="margin: 0;">
-                            {% for range in msg.parsed.ranges %}
-                                <li style="margin: 0;">{{ range.address }} - {{ range.distance }}</li>
+                        <table>
+                            <tr>
+                                <th>peer</th>
+                                <th>RSSI</th>
+                                <th>distance</th>
+                            </tr>
+                            {% for entry in msg.parsed.ranges %}
+                                <tr>
+                                    <td>{% mesh_node entry.peer %}</td>
+                                    <td>{{ entry.rssi }}</td>
+                                    <td>{{ entry.distance }}</td>
+                                </tr>
                             {% endfor %}
-                        </ul>
+                        </table>
 
                     {% elif msg.message_type == "LOCATE_RAW_FTM_RESULTS" %}
-                        <strong>peer:</strong> {{ msg.parsed.peer }}<br>
+                        <p><strong>peer:</strong> {% mesh_node msg.parsed.peer %}</p>
                         <table class="smalltable">
                             <tr>
-                                <th>i</th>
                                 <th>token</th>
                                 <th>rssi</th>
                                 <th>rtt</th>
@@ -104,7 +111,6 @@
                             </tr>
                             {% for entry in msg.parsed.results %}
                                 <tr>
-                                    <td>{{ forloop.counter0 }}</td>
                                     <td>{{ entry.dlog_token }}</td>
                                     <td>{{ entry.rssi }}</td>
                                     <td>{{ entry.rtt }}</td>
@@ -126,7 +132,7 @@
                         {% endfor %}
                     {% endif %}
                 </td>
-                <td><a href="{% url "control.mesh.node.detail" pk=msg.uplink_node.address %}">{{ msg.uplink_node }}</a></td>
+                <td>{% mesh_node msg.uplink_node %}</td>
             </tr>
         {% endfor %}
     </table>
diff --git a/src/c3nav/control/templatetags/__init__.py b/src/c3nav/control/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/c3nav/control/templatetags/mesh_node.py b/src/c3nav/control/templatetags/mesh_node.py
new file mode 100644
index 00000000..2aadeb35
--- /dev/null
+++ b/src/c3nav/control/templatetags/mesh_node.py
@@ -0,0 +1,20 @@
+from django import template
+from django.urls import reverse
+from django.utils.html import format_html
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def mesh_node(context, bssid):
+    name = context.get("node_names", {}).get(bssid, None)
+    if name:
+        return format_html(
+            '<a href="{url}">{bssid}</a> ({name})',
+            url=reverse('control.mesh.node.detail', kwargs={"pk": bssid}), bssid=bssid, name=name
+        )
+    else:
+        return format_html(
+            '<a href="{url}">{bssid}</a>',
+            url=reverse('control.mesh.node.detail', kwargs={"pk": bssid}), bssid=bssid
+        )
diff --git a/src/c3nav/control/views/mesh.py b/src/c3nav/control/views/mesh.py
index 11607389..babdeb31 100644
--- a/src/c3nav/control/views/mesh.py
+++ b/src/c3nav/control/views/mesh.py
@@ -91,6 +91,7 @@ class MeshMessageListView(ControlPanelMixin, ListView):
         form_data.pop('page', None)
 
         ctx.update({
+            "node_names": get_node_names(),
             'form': self.form,
             'form_data': form_data.urlencode(),
         })
diff --git a/src/c3nav/mesh/dataformats.py b/src/c3nav/mesh/dataformats.py
index a2c4876a..d47ae897 100644
--- a/src/c3nav/mesh/dataformats.py
+++ b/src/c3nav/mesh/dataformats.py
@@ -139,7 +139,8 @@ class LocationPCBRev0Dot2BoardConfig(BoardConfig, board=BoardType.C3NAV_LOCATION
 
 @dataclass
 class RangeResultItem(StructType):
-    address: str = field(metadata={"format": MacAddressFormat()})
+    peer: str = field(metadata={"format": MacAddressFormat()})
+    rssi: int = field(metadata={"format": SimpleFormat('b')})
     distance: int = field(metadata={"format": SimpleFormat('H')})