Skip to content
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

1696 #1707

Merged
merged 3 commits into from
Jan 31, 2022
Merged

1696 #1707

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
20f593d
styles to support a dense detail table. Also, elimate unnecessary y o…
scottjehl Jan 31, 2022
1403269
Support for optionally enabling cols for detail view
scottjehl Jan 31, 2022
274bc2b
detail view to use additional columns and fixes #1696
scottjehl Jan 31, 2022
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
15 changes: 9 additions & 6 deletions www/details.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function createForm($formName, $btnText, $id, $owner, $secret) {

<?php $gaTemplate = 'Details'; include ('head.inc'); ?>
</head>
<body class="result">
<body class="result result-details">
<?php
$tab = 'Test Result';
$subtab = 'Details';
Expand Down Expand Up @@ -122,12 +122,15 @@ function createForm($formName, $btnText, $id, $owner, $secret) {

<?php
$htmlTable = new RunResultHtmlTable($testInfo, $testRunResults);
$htmlTable->disableColumns(array(
RunResultHtmlTable::COL_VISUAL_COMPLETE,
RunResultHtmlTable::COL_COST,
$htmlTable->disableColumns(array(
RunResultHtmlTable::COL_RESULT
));
$htmlTable->enableColumns(array(
RunResultHtmlTable::COL_DOC_COMPLETE,
RunResultHtmlTable::COL_DOC_REQUESTS,
RunResultHtmlTable::COL_DOC_BYTES,
RunResultHtmlTable::COL_FULLYLOADED,
RunResultHtmlTable::COL_REQUESTS,
RunResultHtmlTable::COL_RESULT
RunResultHtmlTable::COL_REQUESTS
));
echo $htmlTable->create(true);
?>
Expand Down
28 changes: 24 additions & 4 deletions www/include/RunResultHtmlTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class RunResultHtmlTable {
const COL_CUMULATIVE_LAYOUT_SHIFT = 'chromeUserTiming.CumulativeLayoutShift';
const COL_TOTAL_BLOCKING_TIME = 'TotalBlockingTime';
const COL_TIME_TO_INTERACTIVE = 'TimeToInteractive';
const COL_DOC_COMPLETE = 'DocComplete';
const COL_DOC_REQUESTS = 'RequestsDoc';
const COL_DOC_BYTES = 'BytesInDoc';


/* @var TestInfo */
private $testInfo;
Expand Down Expand Up @@ -193,6 +197,16 @@ private function _createHead() {
$vitalsBorder = null;
}

if ($this->isColumnEnabled(self::COL_DOC_COMPLETE)) {
$out .= $this->_headCell('<abbr title="Document Complete">DC</abbr> Time', "border");
}
if ($this->isColumnEnabled(self::COL_DOC_REQUESTS)) {
$out .= $this->_headCell('<abbr title="Document Complete">DC</abbr> Requests', "border");
}
if ($this->isColumnEnabled(self::COL_DOC_BYTES)) {
$out .= $this->_headCell('<abbr title="Document Complete">DC</abbr> Bytes', "border");
}

for ($i = 1; $i < 2; $i++) {
if ($this->isColumnEnabled(self::COL_FULLYLOADED)) {
$out .= $this->_headCell("Time", "border");
Expand All @@ -203,6 +217,7 @@ private function _createHead() {
$out .= $this->_headCell("Total Bytes");

}


if ($this->isColumnEnabled(self::COL_CERTIFICATE_BYTES)) {
$out .= $this->_headCell("Certificates");
Expand Down Expand Up @@ -346,10 +361,15 @@ private function _createRow($stepResult, $row, $repeatMetricLabels = false) {
$vitalsClass = $class;
}

//$out .= $this->_bodyCell($idPrefix . "DocComplete" . $idSuffix, $this->_getIntervalMetric($stepResult, "docTime"), $borderClass);
//$out .= $this->_bodyCell($idPrefix . "RequestsDoc" . $idSuffix, $this->_getSimpleMetric($stepResult, "requestsDoc"), $class);
//$out .= $this->_bodyCell($idPrefix . "BytesInDoc" . $idSuffix, $this->_getByteMetricInKbyte($stepResult, "bytesInDoc"), $class);

if ($this->isColumnEnabled(self::COL_DOC_COMPLETE)) {
$out .= $this->_bodyCell($idPrefix . "DocComplete" . $idSuffix, $this->_getIntervalMetric($stepResult, "docTime"), $borderClass);
}
if ($this->isColumnEnabled(self::COL_DOC_REQUESTS)) {
$out .= $this->_bodyCell($idPrefix . "RequestsDoc" . $idSuffix, $this->_getSimpleMetric($stepResult, "requestsDoc"), $class);
}
if ($this->isColumnEnabled(self::COL_DOC_BYTES)) {
$out .= $this->_bodyCell($idPrefix . "BytesInDoc" . $idSuffix, $this->_getByteMetricInKbyte($stepResult, "bytesInDoc"), $class);
}
if ($this->isColumnEnabled(self::COL_FULLYLOADED)) {
$out .= $this->_bodyCell($idPrefix . "FullyLoaded" . $idSuffix, $this->_getIntervalMetric($stepResult, "fullyLoaded"), $borderClass);
}
Expand Down
14 changes: 12 additions & 2 deletions www/pagestyle2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,7 +4489,8 @@ div.overflow-container > *,
left: 0;
z-index: 1000;
max-width: 40vw;
overflow: auto;
overflow-x: auto;
overflow-y: hidden;
}

.scrollableTable #tableResults tbody th {
Expand Down Expand Up @@ -4535,6 +4536,15 @@ table#tableResults.pretty td {
vertical-align: middle;
border: 29px solid #fff;
}
.result-details #tableResults.pretty tr:not(.metric_groups) th {
padding-right: 1rem;
font-size: .8em;
}

.result-details table#tableResults.pretty td {
font-size: 2rem;
padding-right: 1rem;
}

#custom-metrics table.pretty td,
#custom-metrics table.pretty th {
Expand Down Expand Up @@ -4588,7 +4598,7 @@ table.pretty .metric_groups th {
border: 0px solid #fff;
font-weight: 700;
color: #686868;
padding: 0 0 4px;
padding: 0 2rem 4px 0;
/* display: block; */
padding-top: 24px;
font-size: .9em;
Expand Down