2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

prettier names in mesh view

Browse source
This commit is contained in:
Laura Klünder 2023-10-20 15:04:36 +02:00
parent 6a35c6767b
commit 7f7ea64fd3
6 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/control/templates/control/mesh_node_detail.html
View file

@ -42,8 +42,8 @@
<h4>Hardware</h4>
<p>
<strong>Board:</strong> {{ node.last_messages.CONFIG_BOARD.parsed.board_config.board.name }}
(with {{ node.last_messages.CONFIG_HARDWARE.parsed.chip.name }} rev{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_major }}.{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_minor }})
<strong>Board:</strong> {{ node.last_messages.CONFIG_BOARD.parsed.board_config.board.pretty_name }}
(with {{ node.last_messages.CONFIG_HARDWARE.parsed.chip.pretty_name }} rev{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_major }}.{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_minor }})
{% if node.last_messages.CONFIG_BOARD.parsed.led %}
<br>

6
src/c3nav/control/templates/control/mesh_nodes.html
View file

@ -18,7 +18,7 @@
<select name="send_msg_type" style="display: inline-block; width: auto;" required>
<option value="">select type</option>
{% for msg_type in send_msg_types %}
<option value="{{ msg_type }}">{{ msg_type }}</option>
<option value="{{ msg_type.name }}">{{ msg_type.pretty_name }}</option>
{% endfor %}
</select>
<button type="submit">{% trans 'Send message' %}</button>
@ -45,8 +45,8 @@
<tr>
<td><a href="{% url "control.mesh.node.detail" pk=node.address %}">{{ node }}</a></td>
<td>
{{ node.last_messages.CONFIG_BOARD.parsed.board_config.board.name }}
({{ node.last_messages.CONFIG_HARDWARE.parsed.get_chip_display }} <small>rev{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_major }}.{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_minor }}</small>)
{{ node.last_messages.CONFIG_BOARD.parsed.board_config.board.pretty_name }}
({{ node.last_messages.CONFIG_HARDWARE.parsed.chip.pretty_name }} <small>rev{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_major }}.{{ node.last_messages.CONFIG_HARDWARE.parsed.revision_minor }}</small>)
</td>
<td>
{{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.version }}

2
src/c3nav/control/views/mesh.py
View file

@ -30,7 +30,7 @@ class MeshNodeListView(ControlPanelMixin, ListView):
def get_context_data(self, *args, **kwargs):
return {
**super().get_context_data(*args, **kwargs),
"send_msg_types": [msg_type.name for msg_type in MeshMessageForm.msg_types.keys()],
"send_msg_types": {msg_type for msg_type in MeshMessageForm.msg_types.keys()}
}
def post(self, request):