From a8cabe16cd7f97ad02e1ce9d8505f80c3098b481 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 23 Jul 2019 10:06:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=B5=8B?= =?UTF-8?q?=E8=AF=84=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E6=97=B6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E5=88=B0=E5=8F=82=E6=95=B0=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=A1=B5=E9=9D=A2=E5=B4=A9=E6=BA=83=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/submissions_process.js | 2 + models-built/judge_state.js | 10 + models-built/judge_state.js.map | 2 +- models/judge_state.ts | 7 + modules/practice.js | 3 +- modules/problem.js | 4 +- modules/submission.js | 2 +- views/submission.ejs | 58 ----- views/submission_practice.ejs | 439 ++++++++++++++++++++++++++++++++ views/submissions_item.ejs | 7 + 10 files changed, 472 insertions(+), 62 deletions(-) create mode 100644 views/submission_practice.ejs diff --git a/libs/submissions_process.js b/libs/submissions_process.js index b9eb89c..e3d56c3 100644 --- a/libs/submissions_process.js +++ b/libs/submissions_process.js @@ -11,6 +11,8 @@ const getSubmissionInfo = (s, displayConfig) => ({ language: displayConfig.showCode ? ((s.language != null && s.language !== '') ? syzoj.languages[s.language].show : null) : null, codeSize: displayConfig.showCode ? s.code_length : null, submitTime: syzoj.utils.formatDate(s.submit_time), + isPractice: s.is_practice, + c_id: s.c_id }); const getRoughResult = (x, displayConfig, roughOnly) => { diff --git a/models-built/judge_state.js b/models-built/judge_state.js index 1afe4a4..b105d2a 100644 --- a/models-built/judge_state.js +++ b/models-built/judge_state.js @@ -354,6 +354,16 @@ var JudgeState = /** @class */ (function (_super) { TypeORM.Column({ nullable: true, type: "integer" }), __metadata("design:type", Number) ], JudgeState.prototype, "submit_time"); + __decorate([ + TypeORM.Index(), + TypeORM.Column({ nullable: true, type: "integer" }), + __metadata("design:type", Number) + ], JudgeState.prototype, "c_id"); + __decorate([ + TypeORM.Index(), + TypeORM.Column({ nullable: true, type: "integer" }), + __metadata("design:type", Number) + ], JudgeState.prototype, "is_practice"); __decorate([ TypeORM.Column({ nullable: true, type: "integer" }), __metadata("design:type", Number) diff --git a/models-built/judge_state.js.map b/models-built/judge_state.js.map index 19146cf..dd8064e 100644 --- a/models-built/judge_state.js.map +++ b/models-built/judge_state.js.map @@ -1 +1 @@ -{"version":3,"file":"judge_state.js","sourceRoot":"","sources":["../models/judge_state.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"judge_state.js","sourceRoot":"","sources":["../models/judge_state.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/models/judge_state.ts b/models/judge_state.ts index 81f7fc7..8328128 100644 --- a/models/judge_state.ts +++ b/models/judge_state.ts @@ -87,6 +87,13 @@ export default class JudgeState extends Model { @TypeORM.Column({ nullable: true, type: "integer" }) submit_time: number; + @TypeORM.Index() + @TypeORM.Column({ nullable: true, type: "integer" }) + c_id: number; + + @TypeORM.Index() + @TypeORM.Column({ nullable: true, type: "integer" }) + is_practice: number; /* * "type" indicate it's contest's submission(type = 1) or normal submission(type = 0) * if it's contest's submission (type = 1), the type_info is contest_id diff --git a/modules/practice.js b/modules/practice.js index 64590ab..3e0e36e 100644 --- a/modules/practice.js +++ b/modules/practice.js @@ -27,6 +27,7 @@ app.get('/practice', async (req, res) => { if (!currentPId) { // 用户第一次进入练习板块 await userQuery.update(User).set({current_p_id: 1}).where("id = :id", { id:userId }).execute(); + currentPId = 1; } else { await result.forEachAsync(async resultItem => { const c_id = resultItem.id; @@ -202,7 +203,7 @@ app.get('/api/pass/:cid/:pid',async (req, res) => { } }); -app.get('/api/practice/nopass/:cid/:pid',async (req, res) => { +app.get('/api/nopass/:cid/:pid',async (req, res) => { try { const c_id = parseInt(req.params.cid); const p_id = parseInt(req.params.pid); diff --git a/modules/problem.js b/modules/problem.js index 5bea7c5..50903cb 100644 --- a/modules/problem.js +++ b/modules/problem.js @@ -627,7 +627,9 @@ app.post('/problem/practice/:pid/:cid/submit', app.multer.fields([{ name: 'answe language: req.body.language, user_id: curUser.id, problem_id: pid, - is_public: problem.is_public + is_public: problem.is_public, + c_id:cid, + is_practice:1 }); if (!await problem.isAllowedUseBy(curUser)) throw new ErrorMessage('您没有权限进行此操作。'); diff --git a/modules/submission.js b/modules/submission.js index da08b67..e24acf9 100644 --- a/modules/submission.js +++ b/modules/submission.js @@ -194,7 +194,7 @@ app.get('/submission/practice/:id/:pid/:cid', async (req, res) => { } else { judge.code = "作者没有开放此题代码，请联系作者分享。"; } - res.render('submission', { + res.render('submission_practice', { info: getSubmissionInfo(judge, currentConfig), roughResult: getRoughResult(judge, currentConfig, false), code: judge.code, diff --git a/views/submission.ejs b/views/submission.ejs index acd314b..71b9c5e 100644 --- a/views/submission.ejs +++ b/views/submission.ejs @@ -28,9 +28,6 @@ .accordion > .content > .accordion > .content > :last-child { margin-bottom: -10px !important; } -.disabled{ - display: none; -}
@@ -55,8 +52,6 @@ -
<%= cid %>
-
<%= pid %>
<% if (formattedCode !== null) { %> @@ -317,8 +312,6 @@ const vueApp = new Vue({ }); if (token != null) { const loadSocketIO = function () { - const cid = parseInt(document.getElementById('cid').innerHTML); - const pid = parseInt(document.getElementById('pid').innerHTML); let currentVersion = 0; const socket = io(socketUrl); socket.on('connect', function () { @@ -343,68 +336,17 @@ if (token != null) { console.log("Judge finished"); vueApp.roughData.running = false; vueApp.roughData.result = p.roughResult; - if (p.roughResult.result === 'Accepted') { - $.ajax({ - url: `/api/pass/${cid}/${pid}`, - type: 'GET', - success: function (data) { - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - alert('练习功能发生故障'); - } - }); - } else { - $.ajax({ - url: `/api/nopass/${cid}/${pid}`, - type: 'GET', - success: function (data) { - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - alert('练习功能发生故障'); - } - }); - } vueApp.detailResult = p.result; socket.close(); }); socket.emit('join', token, function (data) { console.log("join! ", data); - // data.ok=true; - // data.finished=true; - // data.roughResult = { - // memory: 7128, - // result: "Accepted", - // score: 100, - // time: 272, - // } - // data.running=false; if (data && data.ok) { if (data.finished) { vueApp.roughData.result = data.roughResult; // if (!data.result) location.reload(true); vueApp.detailResult = data.result; vueApp.roughData.running = false; - // if (data.roughResult.result === 'Accepted') { - // $.ajax({ - // url: `/api/pass/${cid}/${pid}`, - // type: 'GET', - // success: function (data) { - // }, - // error: function (XMLHttpRequest, textStatus, errorThrown) { - // alert('练习功能发生故障'); - // } - // }); - // } else { - // $.ajax({ - // url: `/api/nopass/${cid}/${pid}`, - // type: 'GET', - // success: function (data) { - // }, - // error: function (XMLHttpRequest, textStatus, errorThrown) { - // alert('练习功能发生故障'); - // } - // }); - // } socket.close(); } else { if (data.running) { diff --git a/views/submission_practice.ejs b/views/submission_practice.ejs new file mode 100644 index 0000000..365e410 --- /dev/null +++ b/views/submission_practice.ejs @@ -0,0 +1,439 @@ +<% this.title = '提交记录 #' + info.submissionId %> +<% include util %> +<% include header %> + + + + + + + + +<% include submissions_item %> + + + + + + +<% include footer %> diff --git a/views/submissions_item.ejs b/views/submissions_item.ejs index fdd2381..4ed15a0 100644 --- a/views/submissions_item.ejs +++ b/views/submissions_item.ejs @@ -34,9 +34,16 @@ } else return 'Waiting'; }, submissionLink() { + if (this.data.info.c_id && this.data.info.isPractice) { + const practiceUrl = `practice/${this.data.info.submissionId}/${this.data.info.problemId}/${this.data.info.c_id}` + return submissionUrl.replace('20000528', practiceUrl); + } return submissionUrl.replace('20000528', this.data.info.submissionId); }, problemLink() { + if (this.data.info.c_id && this.data.info.isPractice) { + return `practice/classify/${this.data.info.c_id}/problem/${this.data.info.problemId}` + } return problemUrl.replace('20000528', this.data.info.problemId); }, userLink() { From d1312ea584dccc769635d0edbf87a6367b59f5ff Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 23 Jul 2019 17:01:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bugfix:=E5=8E=BB=E9=99=A4=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/submission_practice.ejs | 60 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/views/submission_practice.ejs b/views/submission_practice.ejs index 365e410..acd314b 100644 --- a/views/submission_practice.ejs +++ b/views/submission_practice.ejs @@ -369,42 +369,42 @@ if (token != null) { }); socket.emit('join', token, function (data) { console.log("join! ", data); - data.ok=true; - data.finished=true; - data.roughResult = { - memory: 7128, - result: "Accepted", - score: 100, - time: 272, - } - data.running=false; + // data.ok=true; + // data.finished=true; + // data.roughResult = { + // memory: 7128, + // result: "Accepted", + // score: 100, + // time: 272, + // } + // data.running=false; if (data && data.ok) { if (data.finished) { vueApp.roughData.result = data.roughResult; // if (!data.result) location.reload(true); vueApp.detailResult = data.result; vueApp.roughData.running = false; - if (data.roughResult.result === 'Accepted') { - $.ajax({ - url: `/api/pass/${cid}/${pid}`, - type: 'GET', - success: function (data) { - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - alert('练习功能发生故障'); - } - }); - } else { - $.ajax({ - url: `/api/nopass/${cid}/${pid}`, - type: 'GET', - success: function (data) { - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - alert('练习功能发生故障'); - } - }); - } + // if (data.roughResult.result === 'Accepted') { + // $.ajax({ + // url: `/api/pass/${cid}/${pid}`, + // type: 'GET', + // success: function (data) { + // }, + // error: function (XMLHttpRequest, textStatus, errorThrown) { + // alert('练习功能发生故障'); + // } + // }); + // } else { + // $.ajax({ + // url: `/api/nopass/${cid}/${pid}`, + // type: 'GET', + // success: function (data) { + // }, + // error: function (XMLHttpRequest, textStatus, errorThrown) { + // alert('练习功能发生故障'); + // } + // }); + // } socket.close(); } else { if (data.running) { From bf5738821bc4db756241aa562b35aa26a57f1596 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 23 Jul 2019 17:16:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bugfix:=E4=BC=98=E5=8C=96=E7=BB=83=E4=B9=A0?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/practice.js b/modules/practice.js index 3e0e36e..c21d7d6 100644 --- a/modules/practice.js +++ b/modules/practice.js @@ -57,12 +57,6 @@ app.get('/practice', async (req, res) => { } item.isNow = item.order === currentPId; }); - let userACArray = await utopQuery.where('u_id=:u_id',{u_id:userId}).andWhere("is_finished=1").getMany(); - if (syzoj.config.practice_rating) { - const originRating = syzoj.config.default.user.rating; - const newRating = originRating + userACArray.length * syzoj.config.practice_rating; - await userQuery.update(User).set({rating: newRating}).where('id=:u_id',{u_id:userId}).execute(); - } res.render('practice', { user:res.locals.user, result @@ -197,6 +191,14 @@ app.get('/api/pass/:cid/:pid',async (req, res) => { }); await utop.save(); } + let newutopQuery = UToP.createQueryBuilder(); + let userACArray = await newutopQuery.where('u_id=:u_id',{u_id}).andWhere("is_finished=1").getMany(); + console.log(userACArray.length); + if (syzoj.config.practice_rating) { + const originRating = syzoj.config.default.user.rating; + const newRating = originRating + userACArray.length * syzoj.config.practice_rating; + await userQuery.update(User).set({rating: newRating}).where('id=:u_id',{u_id}).execute(); + } res.send(); } catch(e) { res.send({ error_code: e.errno, error_msg: '练习失败，请稍后重试' });