|
|
@ -175,8 +175,8 @@ const vueApp = new Vue({ |
|
|
|
return "Running"; |
|
|
|
return "Running"; |
|
|
|
} else if (t.cases.some(c => c.status === TaskStatus.Waiting)) { |
|
|
|
} else if (t.cases.some(c => c.status === TaskStatus.Waiting)) { |
|
|
|
return "Waiting"; |
|
|
|
return "Waiting"; |
|
|
|
} else if (t.cases.every(c => c.status === TaskStatus.Done)) { |
|
|
|
} else if (t.cases.every(c => c.status === TaskStatus.Done || c.status === TaskStatus.Skipped)) { |
|
|
|
return this.getStatusString(this.firstNonAC(t.cases.map(c => c.result.type))); |
|
|
|
return this.getStatusString(this.firstNonAC(t.cases.filter(c => c.result).map(c => c.result.type))); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return "System Error"; |
|
|
|
return "System Error"; |
|
|
|
} |
|
|
|
} |
|
|
@ -188,6 +188,8 @@ const vueApp = new Vue({ |
|
|
|
return "Waiting"; |
|
|
|
return "Waiting"; |
|
|
|
} else if (c.status === TaskStatus.Running) { |
|
|
|
} else if (c.status === TaskStatus.Running) { |
|
|
|
return "Running"; |
|
|
|
return "Running"; |
|
|
|
|
|
|
|
} else if (c.status === TaskStatus.Skipped) { |
|
|
|
|
|
|
|
return "Skipped"; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return "System Error"; |
|
|
|
return "System Error"; |
|
|
|
} |
|
|
|
} |
|
|
|