External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4106 from jaredevantabor/job-result-time-badge

Browse Source 
Job result time badge
This commit is contained in:
Jared Tabor
2016-11-23 14:16:29 -08:00
committed by GitHub
parent df658e7f65 5b0f7741a7
commit e4510f4e64
3 changed files with 72 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/src/job-results/job-results.block.less
View File

@@ -127,3 +127,16 @@
height: inherit;
}
}
.JobResults-timeBadge {
float:right;
font-size: 11px;
font-weight: normal;
padding: 1px 10px;
height: 14px;
margin: 3px 15px;
width: 80px;
background-color: @default-bg;
border-radius: 5px;
color: @default-interface-txt;
}

25
awx/ui/client/src/job-results/parse-stdout.service.js
View File

@@ -4,7 +4,7 @@
* All Rights Reserved
*************************************************/
export default ['$log', function($log){
export default ['$log', 'moment', function($log, moment){
var val = {
// parses stdout string from api and formats various codes to the
// correct dom structure
@@ -123,6 +123,27 @@ export default ['$log', function($log){
return string;
},
getStartTimeBadge: function(event, line){
// This will return a div with the badge class
// for the start time to show at the right hand
// side of each stdout header line.
// returns an empty string if not a header line
var emptySpan = "", time;
if ((event.event_name === "playbook_on_play_start" ||
event.event_name === "playbook_on_task_start") &&
line !== "") {
time = moment(event.created).format('HH:mm:ss');
return `<div class="badge JobResults-timeBadge ng-binding">${time}</div>`;
}
else if(event.event_name === "playbook_on_stats" && line.indexOf("PLAY") > -1){
time = moment(event.created).format('HH:mm:ss');
return `<div class="badge JobResults-timeBadge ng-binding">${time}</div>`;
}
else {
return emptySpan;
}
},
// used to add expand/collapse icon next to line numbers of headers
getCollapseIcon: function(event, line) {
var clickClass,
@@ -195,7 +216,7 @@ export default ['$log', function($log){
return `
<div class="JobResultsStdOut-aLineOfStdOut${this.getLineClasses(event, lineArr[1], lineArr[0])}">
<div class="JobResultsStdOut-lineNumberColumn">${this.getCollapseIcon(event, lineArr[1])}${lineArr[0]}</div>
<div class="JobResultsStdOut-stdoutColumn">${this.getAnchorTags(event, this.prettify(lineArr[1]))}</div>
<div class="JobResultsStdOut-stdoutColumn">${this.getAnchorTags(event, this.prettify(lineArr[1]))} ${this.getStartTimeBadge(event, lineArr[1] )}</div>
</div>`;
});