{{ submission.info }}
+{{ submission.info }}
{% endifequal %}
提交时间 : {{ submission.create_time }}
From 6cd898d2c0836710afc508c29bb22600f30eca0e Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 8 Sep 2015 17:12:45 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=9B=E5=BB=BA=20codeMirror=20=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=85=88=E5=88=A4=E6=96=AD=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/oj/problem/problem.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js index 1faeb6d..4612a94 100644 --- a/static/src/js/app/oj/problem/problem.js +++ b/static/src/js/app/oj/problem/problem.js @@ -1,5 +1,10 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirror, csrfTokenHeader, bsAlert) { - var codeEditor = codeMirror($("#code-editor")[0], "text/x-csrc"); + var codeEditorSelector = $("#code-editor")[0]; + // 部分界面逻辑会隐藏代码输入框，先判断有没有。 + if (codeEditorSelector == undefined){ + return; + } + var codeEditor = codeMirror(codeEditorSelector, "text/x-csrc"); var language = $("input[name='language'][checked]").val(); var submissionId; From 4529ce191c71f745454111a2d6693c9ea895b309 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 8 Sep 2015 17:15:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=20daocloud=20=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- daocloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daocloud.yml b/daocloud.yml index e5c5724..1f763d8 100644 --- a/daocloud.yml +++ b/daocloud.yml @@ -4,7 +4,7 @@ services: - mysql env: - - oj_env="daocloud" + - oj_env="local" script: - pip install -r requirements.txt From 2334982f31aa0e3297d5541db81fc3dfe6a864e4 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 8 Sep 2015 17:34:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E6=8E=92=E5=90=8D=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/views.py | 3 ++- template/src/oj/contest/contest_rank.html | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/contest/views.py b/contest/views.py index af8d469..e68b81f 100644 --- a/contest/views.py +++ b/contest/views.py @@ -416,4 +416,5 @@ def contest_rank_page(request, contest_id): return render(request, "oj/contest/contest_rank.html", {"contest": contest, "contest_problems": contest_problems, - "result": sorted(result, cmp=_cmp, reverse=True)}) + "result": sorted(result, cmp=_cmp, reverse=True), + "auto_refresh": request.GET.get("auto_refresh", None) == "true"}) diff --git a/template/src/oj/contest/contest_rank.html b/template/src/oj/contest/contest_rank.html index 7d17134..ac2bb15 100644 --- a/template/src/oj/contest/contest_rank.html +++ b/template/src/oj/contest/contest_rank.html @@ -50,6 +50,7 @@ {% endfor %} + 自动刷新 {% else %}还没有结果
{% endif %} @@ -60,4 +61,11 @@ {% block js_block %} +{% if auto_refresh %} + + {% endif %} {% endblock %} \ No newline at end of file From fbd99450ec42837cda9cd417e56591a0d5db8fd2 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 8 Sep 2015 17:36:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20ci=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- daocloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daocloud.yml b/daocloud.yml index 1f763d8..5e9f6ff 100644 --- a/daocloud.yml +++ b/daocloud.yml @@ -8,5 +8,5 @@ env: script: - pip install -r requirements.txt - - mkdir LOG + - mkdir log - python manage.py test \ No newline at end of file From cd5ce220da35b2ef4aa1db86ee5ce22e10ad3983 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 8 Sep 2015 17:48:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=8C=9C=E6=B5=8B=E4=BB=A3=E7=A0=81=E8=AF=AD=E8=A8=80=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=AF=AD=E8=A8=80=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/oj/problem/problem.js | 37 +++++++++++++++++++------ 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js index 4612a94..823afc8 100644 --- a/static/src/js/app/oj/problem/problem.js +++ b/static/src/js/app/oj/problem/problem.js @@ -1,7 +1,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirror, csrfTokenHeader, bsAlert) { var codeEditorSelector = $("#code-editor")[0]; // 部分界面逻辑会隐藏代码输入框，先判断有没有。 - if (codeEditorSelector == undefined){ + if (codeEditorSelector == undefined) { return; } var codeEditor = codeMirror(codeEditorSelector, "text/x-csrc"); @@ -92,9 +92,37 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro }) } + function guessLanguage(code) { + //cpp + if (code.indexOf("using namespace std") > -1) { + return "2"; + } + //c + if (code.indexOf("printf") > -1) { + return "1"; + } + //java + if (code.indexOf("public class Main")) { + return "3"; + } + } + $("#submit-code-button").click(function () { var code = codeEditor.getValue(); + + if (!code.trim()) { + bsAlert("请填写代码！"); + hideLoading(); + return false; + } + + if(guessLanguage(code) != language){ + if(!confirm("您选择的代码语言可能存在错误，是否继续提交？")){ + return; + } + } + if (location.href.indexOf("contest") > -1) { var problemId = location.pathname.split("/")[4]; var contestId = location.pathname.split("/")[2]; @@ -118,15 +146,8 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro showLoading(); - if (!code.trim()) { - bsAlert("请填写代码！"); - hideLoading(); - return false; - } - $("#result").html(""); - $.ajax({ beforeSend: csrfTokenHeader, url: url, From e357dd293f3cb2d2293872727af2310f29ae7965 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 8 Sep 2015 17:50:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=99=A8=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/contest/contest_problem.html | 6 +++--- template/src/oj/problem/problem.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/template/src/oj/contest/contest_problem.html b/template/src/oj/contest/contest_problem.html index 4cf7e3b..0dc4918 100644 --- a/template/src/oj/contest/contest_problem.html +++ b/template/src/oj/contest/contest_problem.html @@ -72,13 +72,13 @@