diff --git a/web/index.html b/web/index.html index ab43604b..5a0d130a 100644 --- a/web/index.html +++ b/web/index.html @@ -76,11 +76,8 @@

Results Filter

-

Interop Status

+

Results

- -

Measurement Results

-
diff --git a/web/script.js b/web/script.js index 15acd41c..f9b68e35 100644 --- a/web/script.js +++ b/web/script.js @@ -82,10 +82,16 @@ function fillInteropTable(result) { var index = 0; var appendResult = function(el, res, i, j) { - result.results[index].forEach(function(item) { + function makeResult(item) { if(item.result !== res) return; - el.appendChild(getLogLink(result.log_dir, result.servers[j], result.clients[i], item.name, item.abbr, res)); - }); + var link = getLogLink(result.log_dir, result.servers[j], result.clients[i], item.name, item.abbr, res) + if (item.hasOwnProperty("details")) + link.title = "" + item.details + "
" + link.title; + $(link).attr("data-toggle", "tooltip").attr("data-placement", "bottom").attr("data-html", true).tooltip(); + el.appendChild(link); + } + result.results[index].forEach(makeResult); + result.measurements[index].forEach(makeResult); }; var t = document.getElementById("interop"); @@ -105,30 +111,6 @@ } } - function fillMeasurementTable(result) { - var t = document.getElementById("measurements"); - t.innerHTML = ""; - makeColumnHeaders(t, result); - var tbody = t.createTBody(); - var index = 0; - for(var i = 0; i < result.clients.length; i++) { - var row = makeRowHeader(tbody, result, i); - for(var j = 0; j < result.servers.length; j++) { - var res = result.measurements[index]; - var cell = row.insertCell(j+1); - cell.className = "server-" + result.servers[j] + " client-" + result.clients[i]; - for(var k = 0; k < res.length; k++) { - var measurement = res[k]; - var link = getLogLink(result.log_dir, result.servers[j], result.clients[i], measurement.name, measurement.abbr, measurement.result); - if (measurement.result === "succeeded") - link.innerHTML += ": " + measurement.details; - cell.appendChild(link); - } - index++; - } - } - } - function dateToString(date) { return date.toLocaleDateString("en-US", { timeZone: 'UTC' }) + " " + date.toLocaleTimeString("en-US", { timeZone: 'UTC', timeZoneName: 'short' }); } @@ -239,7 +221,6 @@ "" + result.quic_version + " (\"draft-" + result.quic_draft + "\")"; fillInteropTable(result); - fillMeasurementTable(result); $("#client").add("#server").add("#test").empty(); $("#client").append(result.clients.map(e => makeButton("client", e)));