External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Use date object to format elapsed time

Browse Source
This commit is contained in:
Marliana Lara
2020-02-10 14:25:34 -05:00
parent b00249b515
commit debbac5c78
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
View File

@@ -175,7 +175,7 @@ class JobOutput extends Component {
try { try {
switch (job.type) { switch (job.type) {
case 'project_update': case 'project_update':
await ProjectUpdatesAPI.destroy(job.idd); await ProjectUpdatesAPI.destroy(job.id);
break; break;
case 'system_job': case 'system_job':
await SystemJobsAPI.destroy(job.id); await SystemJobsAPI.destroy(job.id);

17
awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx
View File

@@ -40,18 +40,19 @@ const Wrapper = styled.div`
font-size: 14px; font-size: 14px;
`; `;
function toHHMMSS(s) { const toHHMMSS = elapsed => {
function pad(n) { const pad = n => {
return `00${n}`.slice(-2); return `00${n}`.slice(-2);
} };
const secs = s % 60; const date = new Date();
s = (s - secs) / 60; date.setTime(elapsed * 1000);
const mins = s % 60; const hrs = date.getUTCHours();
const hrs = (s - mins) / 60; const mins = date.getUTCMinutes();
const secs = date.getUTCSeconds();
return `${pad(hrs)}:${pad(mins)}:${pad(secs)}`; return `${pad(hrs)}:${pad(mins)}:${pad(secs)}`;
} };
const OUTPUT_NO_COUNT_JOB_TYPES = [ const OUTPUT_NO_COUNT_JOB_TYPES = [
'ad_hoc_command', 'ad_hoc_command',