Skip to content

Commit e0428d5

Browse files
Processing Jobs UI mod (#3192)
Modify Processing Jobs UI page to reflect presentation of job ids in detailed study pages. Specifically, the Qiita Job Id is presented, with the PBS/Torque Job Id in brackets.
1 parent fb0dd26 commit e0428d5

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

qiita_pet/templates/admin_processing_job.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,14 @@
7070
'running': 'text-info'
7171
};
7272

73-
out.push('<b class="' + statusToClass[status] + '">' + status + ' (' + row[8] + ')' +
74-
'</b>: ');
73+
//row[8] is PBS/Torque/Slurm id
74+
out.push('<b class="' + statusToClass[status] + '">' + status + ' ' +
75+
row[0] + ' ' + '</b> ');
7576

7677
if (status === 'running' || status === 'queued') {
77-
out.push(row[0] + '</br> <i>' + row[3] + '</i>')
78+
// row[0] is qiita job-id
79+
// row[3] is status 'Step n of 6' and other messages
80+
out.push('[' + row[8] + ']</br> <i>' + row[3] + '</i>')
7881
}
7982
else {
8083
// We write a callback attribute on the link to be able to display a
@@ -90,12 +93,12 @@
9093
// job output is in the fourth element
9194
// We only expect one output with the artifact id in the 2 element
9295
out.push('undefined, ' + row[4][0][1] +')\'');
93-
out.push('>View results</a>')
96+
out.push('><br>View results</a>')
9497

9598
}
9699
else if (status === 'error') {
97100
out.push('"' + escape(encodeURIComponent(row[3])) + '")\'');
98-
out.push('>View error log summary</a>')
101+
out.push('><br>View error log summary</a>')
99102
}
100103
}
101104
return out.join('');

0 commit comments

Comments
 (0)