From 5153a7a871e0582fbd0342fb293d3f90a8e7cce9 Mon Sep 17 00:00:00 2001 From: undefined Date: Sun, 20 Jun 2021 11:27:26 +0800 Subject: [PATCH] =?UTF-8?q?ui:=20=E5=9C=A8=E7=BA=BFIDE=E4=B8=AD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8E=86=E5=8F=B2=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/contest.ts | 10 +----- packages/hydrooj/src/handler/homework.ts | 7 +--- packages/hydrooj/src/handler/problem.ts | 6 ---- packages/ui-default/package.json | 2 +- .../ui-default/templates/problem_detail.html | 4 +-- .../ui-default/templates/problem_submit.html | 34 ------------------- .../templates/problem_submit_tr.html | 11 ------ 8 files changed, 6 insertions(+), 70 deletions(-) delete mode 100644 packages/ui-default/templates/problem_submit_tr.html diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index ad54961cb..94061d891 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.28.42", + "version": "2.28.43", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index 6a9dffba7..65c6a667d 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -321,15 +321,7 @@ export class ContestDetailProblemSubmitHandler extends ContestProblemHandler { @param('tid', Types.ObjectID) @param('pid', Types.Name) - async get(domainId: string, tid: ObjectID, _pid: string) { - const pid = this.tdoc.pids[parseInt(_pid, 36) - 10]; - this.response.body.rdocs = []; - if (contest.canShowRecord.call(this, this.tdoc)) { - this.response.body.rdocs = await record.getUserInProblemMulti( - domainId, this.user._id, - pid, { type: document.TYPE_CONTEST, tid }, - ).sort({ _id: -1 }).limit(10).toArray(); - } + async get(domainId: string, tid: ObjectID, pid: string) { this.response.body.path = [ ['Hydro', 'homepage'], ['contest_main', 'contest_main'], diff --git a/packages/hydrooj/src/handler/homework.ts b/packages/hydrooj/src/handler/homework.ts index 9d27ea0ca..53271dec6 100644 --- a/packages/hydrooj/src/handler/homework.ts +++ b/packages/hydrooj/src/handler/homework.ts @@ -197,12 +197,7 @@ class HomeworkDetailProblemSubmitHandler extends HomeworkDetailProblemHandler { @param('tid', Types.ObjectID) @param('pid', Types.String) - async get(domainId: string, tid: ObjectID, _pid: string) { - const pid = this.tdoc.pids[parseInt(_pid, 36) - 10]; - this.response.body.rdocs = contest.canShowRecord.call(this, this.tdoc) - ? await record.getUserInProblemMulti(domainId, this.user._id, pid, { type: document.TYPE_HOMEWORK, tid }) - .sort('_id', -1).limit(10).toArray() - : []; + async get(domainId: string, tid: ObjectID, pid: string) { this.response.body.path = [ ['Hydro', 'homepage'], ['homework_main', 'homework_main'], diff --git a/packages/hydrooj/src/handler/problem.ts b/packages/hydrooj/src/handler/problem.ts index 15b4b5096..854a72991 100644 --- a/packages/hydrooj/src/handler/problem.ts +++ b/packages/hydrooj/src/handler/problem.ts @@ -248,11 +248,6 @@ export class ProblemSubmitHandler extends ProblemDetailHandler { @param('pid', Types.Name, null, parsePid) async get(domainId: string, pid: string | number) { this.response.template = 'problem_submit.html'; - const rdocs = await record - .getUserInProblemMulti(domainId, this.user._id, pid) - .sort({ _id: -1 }) - .limit(10) - .toArray(); this.response.body = { path: [ ['Hydro', 'homepage'], @@ -262,7 +257,6 @@ export class ProblemSubmitHandler extends ProblemDetailHandler { ], pdoc: this.pdoc, udoc: this.udoc, - rdocs, title: this.pdoc.title, }; } diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index ef163bf9e..5cfa047b7 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.11.29", + "version": "4.11.30", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html index 6fbac506e..4d740fd3d 100644 --- a/packages/ui-default/templates/problem_detail.html +++ b/packages/ui-default/templates/problem_detail.html @@ -12,13 +12,13 @@ {% if tdoc %} {{ set(UiContext, 'canViewRecord', model.contest.canShowRecord.call(handler, tdoc)) }} {{ set(UiContext, 'postSubmitUrl', url('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.pid, tid=tdoc.docId)) }} - {{ set(UiContext, 'getSubmissionsUrl', url('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.pid, tid=tdoc.docId)) }} + {{ set(UiContext, 'getSubmissionsUrl', url('record_main', query={uidOrName:handler.user._id, pid:pdoc.pid, tid:tdoc.docId})) }} {{ set(UiContext, 'getRecordDetailUrl', url('record_detail', rid='{rid}', query={tid:tdoc.docId})) }} {{ set(UiContext, 'pretestConnUrl', "/record-conn?pretest=1&uid=" + handler.user._id + "&pid=" + pdoc.domainId + ":" + pdoc.docId + "&domainId=" + handler.domainId + "&tid=" + tdoc.docId) }} {% else %} {{ set(UiContext, 'canViewRecord', true) }} {{ set(UiContext, 'postSubmitUrl', url('problem_submit', pid=pdoc.docId)) }} - {{ set(UiContext, 'getSubmissionsUrl', url('problem_submit', pid=pdoc.docId)) }} + {{ set(UiContext, 'getSubmissionsUrl', url('record_main', query={uidOrName:handler.user._id, pid:pdoc.docId})) }} {{ set(UiContext, 'getRecordDetailUrl', url('record_detail', rid='{rid}')) }} {{ set(UiContext, 'pretestConnUrl', "/record-conn?pretest=1&uid=" + handler.user._id + "&pid=" + pdoc.docId + "&domainId=" + handler.domainId) }} {% endif %} diff --git a/packages/ui-default/templates/problem_submit.html b/packages/ui-default/templates/problem_submit.html index 4a3a04171..bded3a04b 100644 --- a/packages/ui-default/templates/problem_submit.html +++ b/packages/ui-default/templates/problem_submit.html @@ -3,40 +3,6 @@ {{ set(UiContext, 'pdocConfig', pdoc.config) }}
- {% if not tdoc or rdocs.length %} -
-
-

{{ _('Recent 10 Records') }}

-
-
- {% if not rdocs.length %} - {{ nothing.render('You have not submitted any solutions for this problem') }} - {% else %} - - - - - - - - - - - - - - - - - {%- for rdoc in rdocs -%} - {% include 'problem_submit_tr.html' %} - {%- endfor -%} - -
{{ _('Status') }}{{ _('Peak Memory') }}{{ _('Total Time') }}{{ _('Submit At') }}
- {% endif %} -
-
- {% endif %}

{{ _('Submit to Judge') }}

diff --git a/packages/ui-default/templates/problem_submit_tr.html b/packages/ui-default/templates/problem_submit_tr.html deleted file mode 100644 index 6662c8570..000000000 --- a/packages/ui-default/templates/problem_submit_tr.html +++ /dev/null @@ -1,11 +0,0 @@ -{% import "components/record.html" as record with context %} - - {{ record.render_status_td(rdoc) }} - - {{ (rdoc.memory / 1000)|round(0, 'ceil')|int }} MB - - - {{ rdoc.time|round|int }}ms - - {{ datetimeSpan(rdoc._id)|safe }} -