Skip to content

Merge interop and measurement tables into one #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
larseggert wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge interop and measurement tables into one #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6c8273
Merge interop and measurement tables into one
larseggert Sep 17, 2020
1bc9624
Merge branch 'master' into one-table
larseggert Sep 25, 2020
a198f81
Merge branch 'master' into one-table
larseggert Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,8 @@ <h3 class="mt-5">Results Filter</h3>
<div id="test" class="col-10 col-sm-11 btn-group flex-wrap btn-group-sm" role="group" aria-label="Filter test cases"></div>
</div>

<h3 class="mt-5">Interop Status</h3>
<h3 class="mt-5">Results</h3>
<table id="interop" class="result table"></table>

<h3 class="mt-5">Measurement Results</h3>
<table id="measurements" class="result table"></table>
</div>

<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
Expand Down
37 changes: 9 additions & 28 deletions web/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<strong>" + item.details + "</strong><br>" + 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");
Expand All @@ -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' });
}
Expand Down Expand Up @@ -239,7 +221,6 @@
"<tt>" + result.quic_version + "</tt> (\"draft-" + result.quic_draft + "\")";

fillInteropTable(result);
fillMeasurementTable(result);

$("#client").add("#server").add("#test").empty();
$("#client").append(result.clients.map(e => makeButton("client", e)));
Expand Down