This commit is contained in:
Hannes Verschore 2015-11-20 15:28:42 -08:00
Родитель 2a7b057f2d
Коммит a2c46da92b
6 изменённых файлов: 45 добавлений и 9 удалений

Просмотреть файл

@ -523,8 +523,8 @@ Display.prototype.createToolTip = function (item, extended) {
if (point.length > 1 && point[2] && point[1] != point[2]) {
if (vendor.rangeURL) {
var url = vendor.rangeURL
.replace("{from}", point[1])
.replace("{to}", point[2]);
.replace(/{from}/g, point[1])
.replace(/{to}/g, point[2]);
text += so + 'revs: ' + sc +
'<a href="' + url + '">' + point[1] + " to " + point[2] + '</a>';
} else {
@ -539,9 +539,9 @@ Display.prototype.createToolTip = function (item, extended) {
if (prev && vendor.rangeURL) {
var url = vendor.rangeURL
.replace("{from}", prev[1])
.replace("{to}", point[1])
.replace("{num}", point[1] - prev[1]);
.replace(/{from}/g, prev[1])
.replace(/{to}/g, point[1])
.replace(/{num}/g, point[1] - prev[1]);
text += ' (<a href="' + url + '">changelog</a>)';
}
}

Просмотреть файл

@ -2,6 +2,7 @@
require_once("DB.php");
require_once("Run.php");
require_once("Score.php");
class Build extends DB {
@ -34,6 +35,16 @@ class Build extends DB {
return new Build(mysql_insert_id());
}
public function scores() {
$qScore = mysql_query("SELECT id FROM awfy_score
WHERE build_id = {$this->id}") or die(mysql_error());
$scores = Array();
while ($score = mysql_fetch_object($qScore)) {
$scores[] = new Score($score->id);
}
return $scores;
}
public function revision() {
return $this->select("cset");
}

Просмотреть файл

@ -341,6 +341,21 @@ html, body {
margin-right: 6px;
float: right;
cursor: pointer; }
.regression .info {
border: 1px SOLID #B6B37D;
background-color: #E3DFA6;
padding: 6px;
padding-left: 56px;
margin-bottom: 30px; }
.regression .info .info-sign {
margin-left: -40px;
font-family: 'Glyphicons Halflings';
font-style: normal;
font-weight: normal;
margin-right: 6px;
font-size: 30px;
display: block;
float: left; }
.regression .link {
text-decoration: underline;
cursor: pointer; }

Просмотреть файл

@ -10,6 +10,7 @@ require_once("data-func.php");
require_once("../lib/RetriggerController.php");
require_once("../lib/DB/Regression.php");
require_once("../lib/RegressionTools.php");
$postdata = file_get_contents("php://input");
$request = json_decode($postdata);
@ -54,6 +55,12 @@ for ($i=0; $i < count($ids); $i++) {
$db_build->mode_id())
);
$inbetween = Array();
foreach (RegressionTools::inbetweenBuilds($db_regression) as $build) {
$inbetween[] = $build->revision();
}
$regression["inbetween"] = $inbetween;
$qScores = mysql_query("SELECT * FROM awfy_regression_score
WHERE regression_id = '".$regression["id"]."'") or die(mysql_error());
while ($scores = mysql_fetch_assoc($qScores)) {

Просмотреть файл

@ -82,6 +82,7 @@ awfyApp.controller('pageCtrl', ['$scope', 'MasterService', '$http',
{"name":"fixed"},
{"name":"wontfix"},
{"name":"noise"},
{"name":"obsolete"},
{"name":"infrastructure"},
{"name":"triage"}];

Просмотреть файл

@ -59,9 +59,11 @@
</table>
</div>
<div class='info'>
<div ng-if='obsolete'>
This regression report is possibly obsolete. More specific revisions have been triggered and finished. Please annotate/report the more specific regression and mark this as obsolete.
<div class='info' ng-if='regression.inbetween.length > 0'>
<span class="info-sign">&#xE086;</span>
There are benchmarking scores available from revisions in this regressions range.
<div ng-repeat="revision in regression.inbetween track by $index">
- {{revision}}
</div>
</div>