webui: new format for the scan

code/espurna/wifi.cpp

@@ -1898,13 +1898,14 @@ void onScan(uint32_t client_id) {
         wifi::SsidInfo result(*found);
         wsPost(client_id, [result](JsonObject& root) {
             JsonArray& scan = root.createNestedArray("scanResult");
-            scan.add(result.ssid());
 
             auto& info = result.info();
+            scan.add(wifi::debug::mac(info.bssid()));
+            scan.add(wifi::debug::authmode(info.authmode()));
             scan.add(info.rssi());
-            scan.add(info.authmode());
             scan.add(info.channel());
-            scan.add(wifi::debug::mac(info.bssid()));
+
+            scan.add(result.ssid());
         });
     },
     [client_id](wifi::ScanError error) {

code/html/custom.js

@@ -790,7 +790,7 @@ function doToggle(id, value) {
 }
 
 function doScan() {
-    $("#scanResult").html("");
+    $("#scanResult > tbody").html("");
     $("div.scan.loading").show();
     $("#button-wifi-scan").attr("disabled", true);
     sendAction("scan", {});
@@ -1008,6 +1008,20 @@ function addNetwork(network) {
 
 }
 
+function scanResult(values) {
+    $("div.scan.loading").hide();
+    $("#button-wifi-scan").attr("disabled", false);
+
+    let table = document.getElementById("scanResult");
+    table.style.display = "table";
+
+    let row = table.tBodies[0].insertRow();
+    for (let value of values) {
+        let cell = row.insertCell();
+        cell.appendChild(document.createTextNode(value));
+    }
+}
+
 // -----------------------------------------------------------------------------
 // Relays scheduler
 // -----------------------------------------------------------------------------
@@ -1850,9 +1864,8 @@ function processData(data) {
         }
 
         if ("scanResult" === key) {
-            $("div.scan.loading").hide();
-            $("#button-wifi-scan").attr("disabled", false);
-            $("#scanResult").show();
+            scanResult(value);
+            return;
         }
 
         // -----------------------------------------------------------------------------

code/html/index.html

@@ -873,9 +873,17 @@
                                     </div>
                                 </div>
 
-                                <div class="pure-g">
-                                    <span class="pure-u-1 terminal" id="scanResult" name="scanResult"></span>
-                                </div>
+                                <table class="pure-table" id="scanResult">
+                                    <thead>
+                                        <th>BSSID</th>
+                                        <th>AUTH</th>
+                                        <th>RSSI</th>
+                                        <th>Channel</th>
+                                        <th>SSID</th>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
 
                                 <legend>Networks</legend>