diff --git a/gui/preload-mesh.js b/gui/preload-mesh.js index ed35a23a..135377a8 100644 --- a/gui/preload-mesh.js +++ b/gui/preload-mesh.js @@ -85,7 +85,7 @@ ipcRenderer.on("action-update-mesh-table", (event, arg) => { // check for callsign in callsign list, else use checksum for (let call in callsigns) { if(callsigns[call] == routes[i]["router"]){ - routerText.innerText += ' (' + call + ')'; + routerText.innerHTML += `${call}`; continue; } } @@ -153,7 +153,7 @@ ipcRenderer.on("action-update-mesh-table", (event, arg) => { // check for callsign in callsign list, else use checksum for (let call in callsigns) { if(callsigns[call] == routes[i]["destination"]){ - destinationText.innerText += ' (' + call + ')'; + destinationText.innerHTML += `${call}`; continue; } } @@ -165,7 +165,7 @@ ipcRenderer.on("action-update-mesh-table", (event, arg) => { // check for callsign in callsign list, else use checksum for (let call in callsigns) { if(callsigns[call] == routes[i]["origin"]){ - originText.innerText += ' (' + call + ')'; + originText.innerHTML += `${call}`; continue; } } @@ -189,9 +189,36 @@ ipcRenderer.on("action-update-mesh-table", (event, arg) => { var status = document.createElement("td"); var statusText = document.createElement("span"); - statusText.innerText = routes[i]["status"]; + //statusText.innerText = routes[i]["status"]; + switch (routes[i]["status"]) { + case "acknowledged": + var status_icon = '' + var status_color = 'bg-success' + break; + case "acknowledging": + var status_icon = '' + var status_color = 'bg-warning' + break; + case "forwarding": + var status_icon = '' + var status_color = 'bg-secondary' + break; + default: + var status_icon = '' + var status_color = 'bg-primary' + break; + } + + statusText.innerHTML = ` + ${status_icon} + ${routes[i]["status"]} + ` status.appendChild(statusText); + + + + row.appendChild(timestamp); row.appendChild(destination); row.appendChild(origin); diff --git a/gui/src/mesh-module.html b/gui/src/mesh-module.html index d7af25cb..fadc76f9 100644 --- a/gui/src/mesh-module.html +++ b/gui/src/mesh-module.html @@ -10,6 +10,10 @@ + FreeDATA - Mesh Table