Show timestamp when it doesn't correspondent to master timestamp

This commit is contained in:
Nikos Verschore 2014-12-02 09:19:31 +01:00
Родитель 8652023f69
Коммит ca3c9dd06f
5 изменённых файлов: 19 добавлений и 4 удалений

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

@ -72,12 +72,17 @@
font-size: 1.4em; font-size: 1.4em;
margin-top: -0.2em; margin-top: -0.2em;
} }
@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000345}} @media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000359}}
.box .title { .box .title {
text-transform: uppercase; text-transform: uppercase;
margin-top: 0.4em; margin-top: 0.4em;
} }
@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000350}} @media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000364}}
.box .stamp {
display: block;
font-size: 12px;
}
@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000369}}
.box progress { .box progress {
width: 100%; width: 100%;
height: 6px; height: 6px;

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

@ -92,7 +92,6 @@ awfyApp.controller('pageCtrl', ['$scope', '$http', '$q', '$location',
var path = $location.path().split("/"); var path = $location.path().split("/");
if(machine != path[2]) { if(machine != path[2]) {
path[2] = machine; path[2] = machine;
console.log(machine);
$location.path(path.join("/")); $location.path(path.join("/"));
} }
}); });

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

@ -150,11 +150,17 @@ awfyCtrl.controller('overviewCtrl', ['$scope', '$http', '$routeParams', '$q',
scoreLabel += "ms"; scoreLabel += "ms";
} }
var stamp = false;
if(test["stamp"]*1000 != $scope.$parent.date) {
stamp = test["stamp"]*1000;
}
machine.tests.push({ machine.tests.push({
name: master["modes"][test["modeid"]]["name"], name: master["modes"][test["modeid"]]["name"],
score: Math.round(test["score"]*100)/100, score: Math.round(test["score"]*100)/100,
scoreLabel: scoreLabel, scoreLabel: scoreLabel,
ff: isFF(master["modes"][test["modeid"]]["name"]) ? "ff" : "", ff: isFF(master["modes"][test["modeid"]]["name"]) ? "ff" : "",
stamp: stamp,
}); });
testsuite.maxScore = Math.max(testsuite.maxScore, test["score"]*1); testsuite.maxScore = Math.max(testsuite.maxScore, test["score"]*1);

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

@ -39,7 +39,7 @@
<h3 ng-if="numMachines != 1">{{machine.name}}</h3> <h3 ng-if="numMachines != 1">{{machine.name}}</h3>
<div ng-repeat="test in machine.tests"> <div ng-repeat="test in machine.tests">
<div class='score'>{{test.scoreLabel}}</div> <div class='score'>{{test.scoreLabel}}</div>
<div class='title'>{{test.name}}</div> <div class='title'>{{test.name}}<span class='stamp' ng-if='test.stamp'>{{test.stamp | date:'dd MMM yy HH:mm'}}</span></div>
<progress ng-value='{{test.score}}' ng-attr-max='{{testsuite.maxScore}}' ng-attr-class="{{test.ff}}"></progress> <progress ng-value='{{test.score}}' ng-attr-max='{{testsuite.maxScore}}' ng-attr-class="{{test.ff}}"></progress>
</div> </div>
</div> </div>

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

@ -55,6 +55,11 @@
margin-top: 0.4em; margin-top: 0.4em;
} }
.stamp {
display: block;
font-size: $unit*2;
}
progress { progress {
width: 100%; width: 100%;
height: $unit; height: $unit;