From d15ca0832c547992ca6ffa64faf40f95aadf3ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Sat, 2 Dec 2023 01:38:23 +0100
Subject: [PATCH] fix ota status js a bit

---
 src/c3nav/mesh/templates/mesh/fragment_mesh_websocket.html | 5 ++++-
 src/c3nav/mesh/templates/mesh/ota_detail.html              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/c3nav/mesh/templates/mesh/fragment_mesh_websocket.html b/src/c3nav/mesh/templates/mesh/fragment_mesh_websocket.html
index 68d8b13c..3c13d391 100644
--- a/src/c3nav/mesh/templates/mesh/fragment_mesh_websocket.html
+++ b/src/c3nav/mesh/templates/mesh/fragment_mesh_websocket.html
@@ -149,6 +149,9 @@ function connect() {
                         row.querySelectorALL('.auto-reboot').forEach(x => x.remove());
                         row.querySelectorAll('button').forEach(x => x.remove());
                     }
+                    if (data.status === 'canceled') {
+                        row.querySelectorALL('.device_status').forEach(x => x.remove());
+                    }
                 {% endif %}
                 break;
 
@@ -215,7 +218,7 @@ function connect() {
                     var total = parseInt(row.querySelector('.total_bytes').innerText);
                     row.querySelector('.received_bytes').innerText = data.msg.received_bytes;
                     row.querySelector('progress').value = data.msg.received_bytes;
-                    row.querySelector('.device_status').innerText = data.msg.status;
+                    row.querySelector('.device_status').forEach(x => x.innerText = ' / '+data.msg.status);
                     row.querySelectorAll('.auto-apply a').forEach(x => x.innerText = data.msg.auto_apply ? 'yes' : 'no');
                     row.querySelectorAll('.auto-reboot a').forEach(x => x.innerText = data.msg.auto_reboot ? 'yes' : 'no');
                     row.querySelectorAll('button[name=apply]').forEach(
diff --git a/src/c3nav/mesh/templates/mesh/ota_detail.html b/src/c3nav/mesh/templates/mesh/ota_detail.html
index 7f5d4042..337956d7 100644
--- a/src/c3nav/mesh/templates/mesh/ota_detail.html
+++ b/src/c3nav/mesh/templates/mesh/ota_detail.html
@@ -28,7 +28,7 @@
                 <tr id="ota-recipient-{{ update.pk }}-{{ recipient.node_id }}" data-recipient="{{ recipient.pk }}">
                     <td>{% mesh_node recipient.node %}</td>
                     <td>
-                        <span class="status"></span> / <span class="device_status"></span><br>
+                        <span class="status"></span><span class="device_status"></span><br>
                         <span class="auto-apply"><strong>auto apply:</strong> <a href="#"></a><br></span>
                         <span class="auto-reboot"><strong>auto reboot:</strong> <a href="#"></a><br></span>
                     </td>