Browse Source

增加最大单项耗时的显示

pull/6/head
richie 5 years ago
parent
commit
3657f0d7a0
  1. 19
      libs/submissions_process.js
  2. 1
      views/submission.ejs
  3. 3
      views/submissions_item.ejs

19
libs/submissions_process.js

@ -1,4 +1,5 @@
const { getCachedJudgeState } = require('./judger'); const {getCachedJudgeState} = require('./judger');
const _ = require('lodash');
const getSubmissionInfo = (s, displayConfig) => ({ const getSubmissionInfo = (s, displayConfig) => ({
submissionId: s.id, submissionId: s.id,
@ -13,6 +14,12 @@ const getSubmissionInfo = (s, displayConfig) => ({
}); });
const getRoughResult = (x, displayConfig, roughOnly) => { const getRoughResult = (x, displayConfig, roughOnly) => {
let max = 0;
_.forEach(x.result.judge.subtasks, function (item) {
_.forEach(item.cases, function (one) {
max = Math.max(max, one.result.time);
});
});
if (displayConfig.showResult) { if (displayConfig.showResult) {
if (x.pending) { if (x.pending) {
let res = getCachedJudgeState(x.task_id) || null; let res = getCachedJudgeState(x.task_id) || null;
@ -22,6 +29,7 @@ const getRoughResult = (x, displayConfig, roughOnly) => {
return Object.assign({}, res, { return Object.assign({}, res, {
result: 'Judging', result: 'Judging',
time: 0, time: 0,
maxItemTime: 0,
memory: 0, memory: 0,
score: 0 score: 0
}); });
@ -30,6 +38,7 @@ const getRoughResult = (x, displayConfig, roughOnly) => {
return { return {
result: x.status, result: x.status,
time: displayConfig.showUsage ? x.total_time : null, time: displayConfig.showUsage ? x.total_time : null,
maxItemTime: displayConfig.showUsage ? max : null,
memory: displayConfig.showUsage ? x.max_memory : null, memory: displayConfig.showUsage ? x.max_memory : null,
score: displayConfig.showScore ? x.score : null score: displayConfig.showScore ? x.score : null
}; };
@ -37,14 +46,14 @@ const getRoughResult = (x, displayConfig, roughOnly) => {
} else { } else {
// 0: Waiting 1: Running // 0: Waiting 1: Running
if (x.status === "System Error") if (x.status === "System Error")
return { result: "System Error" }; return {result: "System Error"};
if (x.compilation == null || [0, 1].includes(x.compilation.status)) { if (x.compilation == null || [0, 1].includes(x.compilation.status)) {
return null; return null;
} else { } else {
if (x.compilation.status === 2) { // 2 is TaskStatus.Done if (x.compilation.status === 2) { // 2 is TaskStatus.Done
return { result: "Submitted" }; return {result: "Submitted"};
} else { } else {
return { result: "Compile Error" }; return {result: "Compile Error"};
} }
} }
} }
@ -85,4 +94,4 @@ const processOverallResult = (source, config) => {
}; };
} }
module.exports = { getRoughResult, getSubmissionInfo, processOverallResult }; module.exports = {getRoughResult, getSubmissionInfo, processOverallResult};

1
views/submission.ejs

@ -39,6 +39,7 @@
<th>状态</th> <th>状态</th>
<th v-if="displayConfig.showScore">分数</th> <th v-if="displayConfig.showScore">分数</th>
<th v-if="displayConfig.showUsage">总时间</th> <th v-if="displayConfig.showUsage">总时间</th>
<th v-if="displayConfig.showUsage">最大单项时间</th>
<th v-if="displayConfig.showUsage">内存</th> <th v-if="displayConfig.showUsage">内存</th>
<th v-if="displayConfig.showCode">代码 / 答案文件</th> <th v-if="displayConfig.showCode">代码 / 答案文件</th>
<th>提交者</th> <th>提交者</th>

3
views/submissions_item.ejs

@ -88,6 +88,8 @@
<% } %> <% } %>
<td v-if="config.showUsage">{{ (data.result.time || 0).toString() + ' ms' }}</td> <td v-if="config.showUsage">{{ (data.result.time || 0).toString() + ' ms' }}</td>
<td v-if="config.showUsage">{{ (data.result.maxItemTime || 0).toString() + ' ms' }}</td>
<% if (active === 'submissions') { %> <% if (active === 'submissions') { %>
<td v-if="config.showUsage">{{ formatSize(data.result.memory * 1024, 2) }}</td> <td v-if="config.showUsage">{{ formatSize(data.result.memory * 1024, 2) }}</td>
<% } else { %> <% } else { %>
@ -177,6 +179,7 @@
} }
$('#modal-rejudge').modal('show'); $('#modal-rejudge').modal('show');
} }
function check_share() { function check_share() {
$('#modal-share').modal('show'); $('#modal-share').modal('show');
} }

Loading…
Cancel
Save