From 7fc808b2e990345ee4ecefbf29b6e22c50f857dc Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 13 Aug 2019 16:07:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/submission.ejs | 2 +- views/submission_contest.ejs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/submission.ejs b/views/submission.ejs index 2715197..bc9e671 100644 --- a/views/submission.ejs +++ b/views/submission.ejs @@ -352,7 +352,7 @@ if (token != null) { socket.emit('join', token, function (data) { console.log("join! ", data); if (data && data.ok) { - if (data.finished && data.result && data.result.judge) { + if (data.finished && data.result && data.result.judge && data.result.judge.subtasks) { let max=0; data.result.judge.subtasks.forEach(function (item) { item.cases.forEach(function (one) { diff --git a/views/submission_contest.ejs b/views/submission_contest.ejs index e4484d9..4bd7ab8 100644 --- a/views/submission_contest.ejs +++ b/views/submission_contest.ejs @@ -337,7 +337,7 @@ if (token != null) { socket.on('finish', function (p) { console.log("Judge finished"); let max=0; - if (p && p.result && p.result.judge) { + if (p && p.result && p.result.judge && p.result.judge.subtasks) { p.result.judge.subtasks.forEach(function (item) { item.cases.forEach(function (one) { max = one.result.time @@ -353,7 +353,7 @@ if (token != null) { socket.emit('join', token, function (data) { console.log("join! ", data); if (data && data.ok) { - if (data.finished && data.result && data.result.judge) { + if (data.finished && data.result && data.result.judge && data.result.judge.subtasks) { let max=0; data.result.judge.subtasks.forEach(function (item) { item.cases.forEach(function (one) { From 4ae2dd38e0120cff2d71bbfd3766f7782b3b8177 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 13 Aug 2019 16:08:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/judger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/judger.js b/libs/judger.js index 173f846..ff7d812 100644 --- a/libs/judger.js +++ b/libs/judger.js @@ -208,7 +208,7 @@ async function connect() { judge_state.result = convertedResult.result; await judge_state.save(); await judge_state.updateRelatedInfo(false); - } else if (result.type == interface.ProgressReportType.Compiled) { + } else if (result.type === interface.ProgressReportType.Compiled) { if (!judge_state) return; judge_state.compilation = result.progress; await judge_state.save(); From 478ecd51b6c9f3dfc5e2ecaf202c424ecbd49339 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 13 Aug 2019 18:31:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bugfix:=E6=98=B5=E7=A7=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/user_edit.ejs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/views/user_edit.ejs b/views/user_edit.ejs index e1d297d..c4de262 100644 --- a/views/user_edit.ejs +++ b/views/user_edit.ejs @@ -22,6 +22,10 @@ <% } %> > +
+ + +
@@ -72,11 +76,6 @@
-
- - -
-