github
/
fair-web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of zhaojunzhe/fair-web into master

pull/31/head
richie 5 years ago committed by Gogs
parent
c1fcd19b4b 3a5491550d
commit
9244ec9a87
5 changed files with 44 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      modules/socketio.js
  2. 2
      modules/submission.js
  3. 5
      views/admin_classify.ejs
  4. 20
      views/submission.ejs
  5. 20
      views/submission_contest.ejs

42
modules/socketio.js
Unescape View File

@ -27,26 +27,27 @@ function processOverallResult(source, config) {
}
return {
compile: source.compile,
judge: config.showDetailResult ? (source.judge && {
subtasks: source.judge.subtasks && source.judge.subtasks.map(st => ({
score: st.score,
cases: st.cases.map(cs => ({
status: cs.status,
result: cs.result && {
type: cs.result.type,
time: config.showUsage ? cs.result.time : undefined,
memory: config.showUsage ? cs.result.memory : undefined,
scoringRate: cs.result.scoringRate,
systemMessage: cs.result.systemMessage,
input: config.showTestdata ? cs.result.input : undefined,
output: config.showTestdata ? cs.result.output : undefined,
userOutput: config.showTestdata ? cs.result.userOutput : undefined,
userError: config.showTestdata ? cs.result.userError : undefined,
spjMessage: config.showTestdata ? cs.result.spjMessage : undefined,
}
}))
judge: {
subtasks: source.judge && source.judge.subtasks ? source.judge.subtasks.map(st => ({
score: st.score,
cases: st.cases.map(cs => ({
status: cs.status,
errorMessage: cs.errorMessage,
result: cs.result && {
type: cs.result.type,
time: config.showUsage ? cs.result.time : undefined,
memory: config.showUsage ? cs.result.memory : undefined,
scoringRate: cs.result.scoringRate,
systemMessage: cs.result.systemMessage,
input: config.showTestdata ? cs.result.input : undefined,
output: config.showTestdata ? cs.result.output : undefined,
userOutput: config.showTestdata ? cs.result.userOutput : undefined,
userError: config.showTestdata ? cs.result.userError : undefined,
spjMessage: config.showTestdata ? cs.result.spjMessage : undefined,
}
}))
}) : null
})) : null
}
};
}
function getCompileStatus(status) {
@ -149,7 +150,8 @@ function initializeSocketIO(s) {
return {
ok: true,
finished: false,
running: false
running: false,
result: processOverallResult(finishedJudgeList[taskId], clientDisplayConfigList[socket.id])
};
}
}

2
modules/submission.js
Unescape View File

@ -293,7 +293,7 @@ app.get('/submission/:id', async (req, res) => {
formattedCode: judge.formattedCode ? judge.formattedCode.toString("utf8") : null,
preferFormattedCode: res.locals.user ? res.locals.user.prefer_formatted_code : true,
detailResult: processOverallResult(judge.result, currentConfig),
socketToken: (judge.task_id != null) ? jwt.sign({
socketToken: (judge.pending && judge.task_id != null) ? jwt.sign({
taskId: judge.task_id,
type: 'detail',
displayConfig: displayConfig

5
views/admin_classify.ejs
Unescape View File

@ -160,7 +160,6 @@
return !this.disabledId.includes(row.id);
},
toggleSelection(rows) {
console.log(rows);
if (rows) {
rows.forEach(row => {
this.$refs.multipleTable.toggleRowSelection(row);
@ -237,7 +236,7 @@
}
that.disabledId = findDifference(currentIdArray, that.usedProblemId);
that.multipleSelection = that.problemIdArray;
that.toggleSelection(that.multipleSelection)
that.getProblemPagination(1);
that.order = order;
}
},
@ -249,7 +248,6 @@
},
show: function(id){
let that = this;
this.getProblemPagination(1);
if (id) {
this.classifyId = id;
this.getClassifyInfos(id);
@ -274,7 +272,6 @@
order: this.order,
problemIdArray: this.multipleSelection.map(item=>item.id)
}
console.log(obj.problemIdArray);
if (this.classifyId === -1) {
$.ajax({
url: '/api/practice/create',

20
views/submission.ejs
Unescape View File

@ -351,17 +351,17 @@ if (token != null) {
});
socket.emit('join', token, function (data) {
console.log("join! ", data);
let max=0;
if (data && data.result && data.result.judge) {
data.result.judge.subtasks.forEach(function (item) {
item.cases.forEach(function (one) {
max = one.result.time
});
});
}
if (data && data.ok) {
if (data.finished) {
data.roughResult.maxItemTime = max;
if (data.finished && data.result && data.result.judge) {
let max=0;
data.result.judge.subtasks.forEach(function (item) {
item.cases.forEach(function (one) {
max = one.result.time
});
});
if (max !== 0) {
data.roughResult.maxItemTime = max;
}
vueApp.roughData.result = data.roughResult;
// if (!data.result) location.reload(true);
vueApp.detailResult = data.result;

20
views/submission_contest.ejs
Unescape View File

@ -352,17 +352,17 @@ if (token != null) {
});
socket.emit('join', token, function (data) {
console.log("join! ", data);
let max=0;
if (data && data.result && data.result.judge) {
data.result.judge.subtasks.forEach(function (item) {
item.cases.forEach(function (one) {
max = one.result.time
});
});
}
if (data && data.ok) {
if (data.finished) {
data.roughResult.maxItemTime = max;
if (data.finished && data.result && data.result.judge) {
let max=0;
data.result.judge.subtasks.forEach(function (item) {
item.cases.forEach(function (one) {
max = one.result.time
});
});
if (max !== 0) {
data.roughResult.maxItemTime = max;
}
vueApp.roughData.result = data.roughResult;
// if (!data.result) location.reload(true);
vueApp.detailResult = data.result;

Write Preview
Loading…
Cancel
Save