From 4dd5aa3eba2f09c1a72cd59a02a27f78a58a7b25 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 17 Oct 2015 16:49:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=20problem=20=E5=92=8C=20cont?= =?UTF-8?q?est=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A8=A1=E6=9D=BF=E7=9A=84=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/decorators.py | 9 +- contest/views.py | 25 +++-- contest_submission/views.py | 2 +- problem/decorators.py | 12 +- problem/serizalizers.py | 12 +- problem/tests.py | 66 ++++------- problem/views.py | 23 ++-- static/src/js/build.js | 3 + submission/views.py | 4 +- template/src/oj/contest/contest_problem.html | 103 ----------------- .../src/oj/contest/contest_problems_list.html | 104 +++++++++--------- template/src/oj/contest/my_submission.html | 74 ------------- .../src/oj/contest/my_submissions_list.html | 52 --------- template/src/oj/problem/_problem_header.html | 8 +- .../src/oj/problem/_problem_main_info.html | 29 +++++ template/src/oj/problem/_submit_problem.html | 25 +++++ template/src/oj/problem/contest_problem.html | 42 +++++++ template/src/oj/problem/problem.html | 56 +--------- .../my_submission.html | 0 .../problem_my_submissions_list.html} | 17 ++- 20 files changed, 238 insertions(+), 428 deletions(-) delete mode 100644 template/src/oj/contest/contest_problem.html delete mode 100644 template/src/oj/contest/my_submission.html delete mode 100644 template/src/oj/contest/my_submissions_list.html create mode 100644 template/src/oj/problem/_problem_main_info.html create mode 100644 template/src/oj/problem/_submit_problem.html create mode 100644 template/src/oj/problem/contest_problem.html rename template/src/oj/{problem => submission}/my_submission.html (100%) rename template/src/oj/{problem/my_submissions_list.html => submission/problem_my_submissions_list.html} (70%) diff --git a/contest/decorators.py b/contest/decorators.py index 600d98b8..a0160326 100644 --- a/contest/decorators.py +++ b/contest/decorators.py @@ -32,7 +32,7 @@ def check_user_contest_permission(func): else: return HttpResponseRedirect("/login/") - # kwargs 就包含了url 里面的播或参数 + # kwargs 就包含了 url 里面的参数 if "contest_id" in kwargs: contest_id = kwargs["contest_id"] elif "contest_id" in request.data: @@ -54,6 +54,13 @@ def check_user_contest_permission(func): if request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by: return func(*args, **kwargs) + # 管理员可见隐藏的比赛，已经先判断了身份 + if not contest.visible: + if request.is_ajax(): + return error_response(u"比赛不存在") + else: + return error_page(request, u"比赛不存在") + # 有密码的公开赛 if contest.contest_type == PASSWORD_PROTECTED_CONTEST: # 没有输入过密码 diff --git a/contest/views.py b/contest/views.py index e498e401..191e54a0 100644 --- a/contest/views.py +++ b/contest/views.py @@ -293,7 +293,6 @@ def contest_page(request, contest_id): 单个比赛的详情页 """ contest = Contest.objects.get(id=contest_id) - return render(request, "oj/contest/contest_index.html", {"contest": contest}) @@ -304,15 +303,17 @@ def contest_problem_page(request, contest_id, contest_problem_id): """ contest = Contest.objects.get(id=contest_id) try: - contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) + problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) except ContestProblem.DoesNotExist: return error_page(request, u"比赛题目不存在") warning = u"您已经提交过本题的正确答案，重复提交可能造成时间累计。" show_warning = False + try: - submission = ContestSubmission.objects.get(user=request.user, contest=contest, problem=contest_problem) - show_warning = submission.ac - except ContestSubmission.DoesNotExist: + rank = ContestRank.objects.get(user=request.user, contest=contest) + # 提示已经 ac 过这道题了 + show_warning = rank.submission_info.get(str(problem.id), {"is_ac": False})["is_ac"] + except ContestRank.DoesNotExist: pass # 已经结束 @@ -324,14 +325,16 @@ def contest_problem_page(request, contest_id, contest_problem_id): warning = u"比赛没有开始，您是管理员，可以提交和测试题目，但是目前的提交不会计入排名。" show_submit_code_area = False - if contest.status == CONTEST_UNDERWAY: - show_submit_code_area = True - if request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by: + if contest.status == CONTEST_UNDERWAY or \ + request.user.admin_type == SUPER_ADMIN or \ + request.user == contest.created_by: show_submit_code_area = True - return render(request, "oj/contest/contest_problem.html", {"contest_problem": contest_problem, "contest": contest, - "samples": json.loads(contest_problem.samples), - "show_warning": show_warning, "warning": warning, + return render(request, "oj/problem/contest_problem.html", {"problem": problem, + "contest": contest, + "samples": json.loads(problem.samples), + "show_warning": show_warning, + "warning": warning, "show_submit_code_area": show_submit_code_area}) diff --git a/contest_submission/views.py b/contest_submission/views.py index 2f037de9..4c893d2e 100644 --- a/contest_submission/views.py +++ b/contest_submission/views.py @@ -76,7 +76,7 @@ def contest_problem_my_submissions_list_page(request, contest_id, contest_proble submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).order_by( "-create_time"). \ values("id", "result", "create_time", "accepted_answer_time", "language") - return render(request, "oj/contest/my_submissions_list.html", + return render(request, "oj/submission/problem_my_submissions_list.html", {"submissions": submissions, "problem": contest_problem}) diff --git a/problem/decorators.py b/problem/decorators.py index 762c54a7..cc2ac2a4 100644 --- a/problem/decorators.py +++ b/problem/decorators.py @@ -17,12 +17,16 @@ def check_user_problem_permission(func): request = args[0] # 这是在后台使用的url middleware 已经确保用户是登录状态的了 - if request.user.admin_type == SUPER_ADMIN: - return func(*args, **kwargs) try: - Problem.objects.get(id=request.data.get("problem_id", -1), created_by=request.user) + problem = Problem.objects.get(id=request.data.get("id", -1)) except Problem.DoesNotExist: return error_response(u"问题不存在") - return func(*args, **kwargs) + + if request.user.admin_type == SUPER_ADMIN: + return func(*args, **kwargs) + else: + if problem.created_by != request.user: + return error_response(u"问题不存在") + return func(*args, **kwargs) return check diff --git a/problem/serizalizers.py b/problem/serizalizers.py index afa7f432..0865b8f7 100644 --- a/problem/serizalizers.py +++ b/problem/serizalizers.py @@ -25,13 +25,13 @@ class CreateProblemSerializer(serializers.Serializer): # [{"input": "1 1", "output": "2"}] samples = ProblemSampleSerializer() test_case_id = serializers.CharField(max_length=40) - source = serializers.CharField(max_length=30, required=False, default=None) time_limit = serializers.IntegerField(min_value=1) memory_limit = serializers.IntegerField(min_value=1) difficulty = serializers.IntegerField() tags = serializers.ListField(child=serializers.CharField(max_length=10)) hint = serializers.CharField(max_length=3000, allow_blank=True) - visible = visible = serializers.BooleanField() + source = serializers.CharField(max_length=100, required=False, default=None) + visible = serializers.BooleanField() class ProblemTagSerializer(serializers.ModelSerializer): @@ -61,15 +61,11 @@ class EditProblemSerializer(serializers.Serializer): input_description = serializers.CharField(max_length=10000) output_description = serializers.CharField(max_length=10000) test_case_id = serializers.CharField(max_length=40) - source = serializers.CharField(max_length=30) + source = serializers.CharField(max_length=100) time_limit = serializers.IntegerField(min_value=1) memory_limit = serializers.IntegerField(min_value=1) difficulty = serializers.IntegerField() tags = serializers.ListField(child=serializers.CharField(max_length=20)) samples = ProblemSampleSerializer() hint = serializers.CharField(max_length=3000, allow_blank=True) - visible = serializers.BooleanField() - - -class CreateProblemTagSerializer(serializers.Serializer): - name = serializers.CharField(max_length=10) + visible = serializers.BooleanField() \ No newline at end of file diff --git a/problem/tests.py b/problem/tests.py index 98194861..e168ef85 100644 --- a/problem/tests.py +++ b/problem/tests.py @@ -7,16 +7,15 @@ from django.core.urlresolvers import reverse from rest_framework.test import APITestCase, APIClient from account.models import User, SUPER_ADMIN +from account.tests import create_user from problem.models import Problem, ProblemTag class ProblemPageTest(TestCase): def setUp(self): self.client = APIClient() - self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - self.user.set_password("testaa") - self.user.save() - self.client.login(username="test", password="testaa") + self.user = create_user() + self.client.login(username="test", password="111111") self.problem = Problem.objects.create(title="title1", description="description1", input_description="input1_description", @@ -31,11 +30,11 @@ class ProblemPageTest(TestCase): created_by=User.objects.get(username="test")) def test_visit_problem_successfully(self): - response = self.client.get('/problem/1/') - self.assertEqual(response.status_code, 200) + response = self.client.get('/problem/' + str(self.problem.id) + "/") + self.assertTemplateUsed(response, "oj/problem/problem.html") def test_problem_does_not_exist(self): - response = self.client.get('/problem/3/') + response = self.client.get('/problem/3000/') self.assertTemplateUsed(response, "utils/error.html") @@ -60,10 +59,8 @@ class ProblemAdminTest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("problem_admin_api") - self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - self.user.set_password("testaa") - self.user.save() - self.client.login(username="test", password="testaa") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") ProblemTag.objects.create(name="tag1") ProblemTag.objects.create(name="tag2") self.problem = Problem.objects.create(title="title1", @@ -77,15 +74,9 @@ class ProblemAdminTest(APITestCase): memory_limit=1000, difficulty=1, hint="hint1", - created_by=User.objects.get(username="test")) + created_by=self.user) - # 以下是发布题目的测试 - def test_invalid_format(self): - data = {"title": "test1"} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data["code"], 1) - - def test_release_problem_successfully(self): + def test_create_problem_successfully(self): data = {"title": "title2", "description": "description2", "input_description": "input_description2", @@ -97,30 +88,15 @@ class ProblemAdminTest(APITestCase): "memory_limit": "1000", "difficulty": "1", "hint": "hint1", + "visible": True, "tags": [1]} response = self.client.post(self.url, data=json.dumps(data), content_type="application/json") self.assertEqual(response.data["code"], 0) - # 以下是编辑题目的测试 - def test_invalid_data(self): - data = {"title": "test0"} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data["code"], 1) - - def test_problem_does_not_exist(self): - tags = ProblemTag.objects.filter(id__in=[1]) - self.problem.tags.add(*tags) - data = self._create_data(2, False, [1]) - response = self.client.put(self.url, data=json.dumps(data), content_type="application/json") - self.assertEqual(response.data, {"code": 1, "data": u"该题目不存在！"}) - def test_edit_problem_successfully(self): tags = ProblemTag.objects.filter(id__in=[1]) self.problem.tags.add(*tags) - data = self._create_data(1, True, [1, 2]) - problem = Problem.objects.get(id=data["id"]) - problem.tags.remove(*problem.tags.all()) - problem.tags.add(*ProblemTag.objects.filter(id__in=data["tags"])) + data = self._create_data(self.problem.id, True, [1, 2]) response = self.client.put(self.url, data=json.dumps(data), content_type="application/json") self.assertEqual(response.data["code"], 0) @@ -139,11 +115,11 @@ class ProblemAdminTest(APITestCase): self.assertEqual(item["visible"], True) def test_query_problem_does_not_exist(self): - data = {"problem_id": 2} + data = {"problem_id": 200} response = self.client.get(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) - def test_query_problem_exists(self): + def test_query_existed_problem(self): data = {"problem_id": self.problem.id} response = self.client.get(self.url, data=data) self.assertEqual(response.data["code"], 0) @@ -153,10 +129,8 @@ class ProblemTagAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse('problem_tag_admin_api') - self.user = User.objects.create(username="testx", admin_type=SUPER_ADMIN) - self.user.set_password("testxx") - self.user.save() - self.client.login(username="testx", password="testxx") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") ProblemTag.objects.create(name="tag1") # 以下是返回所有的问题的标签 @@ -168,10 +142,8 @@ class ProblemListPageTest(TestCase): def setUp(self): self.client = Client() self.url = reverse('problem_list_page', kwargs={"page": 1}) - self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - self.user.set_password("testaa") - self.user.save() - self.client.login(username="test", password="testaa") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") ProblemTag.objects.create(name="tag1") ProblemTag.objects.create(name="tag2") self.problem = Problem.objects.create(title="title1", @@ -185,7 +157,7 @@ class ProblemListPageTest(TestCase): memory_limit=1000, difficulty=1, hint="hint1", - created_by=User.objects.get(username="test")) + created_by=self.user) def test_problemListPage_not_exist(self): response = self.client.get('/problems/999/') diff --git a/problem/views.py b/problem/views.py index 6b2c19f5..3b68bae5 100644 --- a/problem/views.py +++ b/problem/views.py @@ -9,21 +9,19 @@ import logging from django.shortcuts import render from django.db.models import Q, Count from django.core.paginator import Paginator - -from rest_framework.views import APIView - +from django.utils.timezone import now from django.conf import settings +from rest_framework.views import APIView from account.models import SUPER_ADMIN from account.decorators import super_admin_required from utils.shortcuts import (serializer_invalid_response, error_response, success_response, paginate, rand_str, error_page) from .serizalizers import (CreateProblemSerializer, EditProblemSerializer, ProblemSerializer, - ProblemTagSerializer, CreateProblemTagSerializer) + ProblemTagSerializer) from .models import Problem, ProblemTag from .decorators import check_user_problem_permission - logger = logging.getLogger("app_info") @@ -59,7 +57,7 @@ class ProblemAdminAPIView(APIView): if serializer.is_valid(): data = serializer.data try: - Problem.objects.get(title=data["title"], description=data["description"]) + Problem.objects.get(title=data["title"]) return error_response(u"添加失败，存在重复的题目") except Problem.DoesNotExist: pass @@ -110,6 +108,7 @@ class ProblemAdminAPIView(APIView): problem.samples = json.dumps(data["samples"]) problem.hint = data["hint"] problem.visible = data["visible"] + problem.last_update_time = now() # 删除原有的标签的对应关系 problem.tags.remove(*problem.tags.all()) @@ -155,7 +154,7 @@ class ProblemAdminAPIView(APIView): keyword = request.GET.get("keyword", None) if keyword: problems = problems.filter(Q(title__contains=keyword) | - Q(description__contains=keyword)) + Q(description__contains=keyword)) return paginate(request, problems, ProblemSerializer) @@ -164,6 +163,7 @@ class TestCaseUploadAPIView(APIView): """ 上传题目的测试用例 """ + def _is_legal_test_case_file_name(self, file_name): # 正整数开头的 .in 或者.out 结尾的 regex = r"^[1-9]\d*\.(in|out)$" @@ -190,10 +190,7 @@ class TestCaseUploadAPIView(APIView): l = [] # 如果文件是直接打包的，那么name_list 就是["1.in", "1.out"]这样的 - # 如果文件还有一层文件夹test_case，那么name_list就是["test_case/", "test_case/1.in", "test_case/1.out"] - # 现在暂时只支持第一种，先判断一下是什么格式的 - # 第一种格式的 if "1.in" in name_list and "1.out" in name_list: for file_name in name_list: if self._is_legal_test_case_file_name(file_name): @@ -251,7 +248,8 @@ class TestCaseUploadAPIView(APIView): "striped_output_md5": striped_md5.hexdigest(), "output_size": os.path.getsize(test_case_dir + str(i + 1) + ".out")} # 写入配置文件 - open(test_case_dir + "info", "w").write(json.dumps(file_info)) + with open(test_case_dir + "info", "w") as f: + f.write(json.dumps(file_info)) return success_response({"test_case_id": problem_test_dir, "file_list": {"input": l[0::2], @@ -311,7 +309,8 @@ def problem_list_page(request, page=1): pass # 右侧标签列表 按照关联的题目的数量排序 排除题目数量为0的 - tags = ProblemTag.objects.annotate(problem_number=Count("problem")).filter(problem_number__gt=0).order_by("-problem_number") + tags = ProblemTag.objects.annotate(problem_number=Count("problem")).filter(problem_number__gt=0).order_by( + "-problem_number") return render(request, "oj/problem/problem_list.html", {"problems": current_page, "page": int(page), diff --git a/static/src/js/build.js b/static/src/js/build.js index 34a05e69..96247c12 100644 --- a/static/src/js/build.js +++ b/static/src/js/build.js @@ -85,6 +85,9 @@ { name: "bootstrap", }, + { + name: "codeMirror" + }, { name: "announcement_0_pack" }, diff --git a/submission/views.py b/submission/views.py index caa2e681..100c5f45 100644 --- a/submission/views.py +++ b/submission/views.py @@ -85,7 +85,7 @@ def problem_my_submissions_list_page(request, problem_id): contest_id__isnull=True).order_by("-create_time"). \ values("id", "result", "create_time", "accepted_answer_time", "language") - return render(request, "oj/problem/my_submissions_list.html", + return render(request, "oj/submission/problem_my_submissions_list.html", {"submissions": submissions, "problem": problem}) @@ -139,7 +139,7 @@ def my_submission(request, submission_id): else: info = None user = User.objects.get(id=submission.user_id) - return render(request, "oj/problem/my_submission.html", + return render(request, "oj/submission/my_submission.html", {"submission": submission, "problem": problem, "info": info, "user": user, "can_share": result["can_share"]}) diff --git a/template/src/oj/contest/contest_problem.html b/template/src/oj/contest/contest_problem.html deleted file mode 100644 index cf60ef8a..00000000 --- a/template/src/oj/contest/contest_problem.html +++ /dev/null @@ -1,103 +0,0 @@ -{% extends 'oj_base.html' %} -{% block title %} - {{ contest_problem.title }} -{% endblock %} -{% block body %} -
- -

{{ contest_problem.title }}

- -

发布时间 : {{ contest_problem.create_time }}   - 时间限制 : {{ contest_problem.time_limit }}ms   - 内存限制 : {{ contest_problem.memory_limit }}M -

- -
-
- - -
{{ contest_problem.description|safe }}
-
-
- - -

{{ contest_problem.input_description }}

- -
- -
- - -

{{ contest_problem.output_description }}

-
- {% for item in samples %} -
- - 复制 - 
{{ item.input }}
-
-
- - 
{{ item.output }}
-
- {% endfor %} - - {% if contest_problem.hint %} -
- -
{{ contest_problem.hint|safe }}
-
- {% endif %} - {% if show_submit_code_area %} -
- -
- - - -
-
-
- - -
-
-
- - -
- {% endif %} - {% if show_warning %} - - {% endif %} -
-
-
-
-
-
-
-{% endblock %} -{% block js_block %} - -{% endblock %} \ No newline at end of file diff --git a/template/src/oj/contest/contest_problems_list.html b/template/src/oj/contest/contest_problems_list.html index e35e28e3..056ba6c0 100644 --- a/template/src/oj/contest/contest_problems_list.html +++ b/template/src/oj/contest/contest_problems_list.html @@ -3,66 +3,66 @@ 比赛题目列表 {% endblock %} {% block body %} -{% load problem %} -
+ {% load problem %} +
-
-
+
+
- + -
- - -
-
- - - - - - - - - - - {% for item in contest_problems %} - - - - - - - {% endfor %} - -
#题目通过率
- - - {{ item.sort_index }} - - {{ item.title }} - {{ item|accepted_radio }}
-
-
+ +
+
+ + + + + + + + + + + {% for item in contest_problems %} + + + + + + + {% endfor %} + +
#题目通过率
+ + + {{ item.sort_index }} + + {{ item.title }} + {{ item|accepted_radio }}
+ +
+
+ +
-
{% endblock %} {% block js_block %} diff --git a/template/src/oj/contest/my_submission.html b/template/src/oj/contest/my_submission.html deleted file mode 100644 index 1e09103c..00000000 --- a/template/src/oj/contest/my_submission.html +++ /dev/null @@ -1,74 +0,0 @@ -{% extends 'oj_base.html' %} -{% block title %} - 我的提交详情 -{% endblock %} -{% block css_block %} - -{% endblock %} -{% block body %} - {% load submission %} -
- - {% include "oj/problem/_problem_header.html" %} -
-
-

运行结果 : - {{ submission.result|translate_result }} - -

- {% ifequal submission.result 0 %} -

时间 : {{ submission.accepted_answer_time }}ms 语言 : - {{ submission.language|translate_language }} -

- {% endifequal %} - {% ifequal submission.result 4 %} -

{{ submission.info }}

- {% endifequal %} -

提交时间 : {{ submission.create_time }}

-
-
- {% ifequal request.user.admin_type 2 %} -

本调试信息仅超级管理员可见

- {% ifequal submission.result 7 %} - 
System Error: {{ submission.info }}
- {% else %} - 
{{ info }}
- {% endifequal %} - - {% endifequal %} - - -
- -
-
- -{% endblock %} -{% block js_block %} - -{% endblock %} \ No newline at end of file diff --git a/template/src/oj/contest/my_submissions_list.html b/template/src/oj/contest/my_submissions_list.html deleted file mode 100644 index 638318ab..00000000 --- a/template/src/oj/contest/my_submissions_list.html +++ /dev/null @@ -1,52 +0,0 @@ -{% extends 'oj_base.html' %} -{% block title %} - 我的提交列表 -{% endblock %} -{% block body %} - - {% load submission %} -
- - {% include "oj/problem/_problem_header.html" %} - - - - - - - - - - - - {% for item in submissions %} - - - - - - - - {% endfor %} - - -
#提交时间语言运行时间结果
{{ forloop.counter }}{{ item.create_time }} - {{ item.language|translate_language }} - - {% if item.accepted_answer_time %} - {{ item.accepted_answer_time }}ms - {% else %} - -- - {% endif %} - - {{ item.result|translate_result }} -
-
-{% endblock %} \ No newline at end of file diff --git a/template/src/oj/problem/_problem_header.html b/template/src/oj/problem/_problem_header.html index afb89cdf..a2da6c7a 100644 --- a/template/src/oj/problem/_problem_header.html +++ b/template/src/oj/problem/_problem_header.html @@ -1,6 +1,8 @@

{{ problem.title }}

-

发布时间 : {{ problem.create_time }}   - 时间限制 : {{ problem.time_limit }}ms   - 内存限制 : {{ problem.memory_limit }}M +

+ 发布时间: {{ problem.create_time }}   + {% if problem.last_update_time %}最后更新: {{ problem.last_update_time }}  {% endif %} + 时间限制: {{ problem.time_limit }}ms   + 内存限制: {{ problem.memory_limit }}M

\ No newline at end of file diff --git a/template/src/oj/problem/_problem_main_info.html b/template/src/oj/problem/_problem_main_info.html new file mode 100644 index 00000000..cdc80a0e --- /dev/null +++ b/template/src/oj/problem/_problem_main_info.html @@ -0,0 +1,29 @@ +
+ + +
{{ problem.description|safe }}
+
+
+ + +

{{ problem.input_description }}

+
+
+ + +

{{ problem.output_description }}

+
+ {% for item in samples %} +
+ + 复制 + 
+{{ item.input }}
+ +
+
+ + 
+{{ item.output }}
+
+ {% endfor %} \ No newline at end of file diff --git a/template/src/oj/problem/_submit_problem.html b/template/src/oj/problem/_submit_problem.html new file mode 100644 index 00000000..f21f45df --- /dev/null +++ b/template/src/oj/problem/_submit_problem.html @@ -0,0 +1,25 @@ +
+ +
+ + + +
+
+
+ + +
+
+
+ + +
\ No newline at end of file diff --git a/template/src/oj/problem/contest_problem.html b/template/src/oj/problem/contest_problem.html new file mode 100644 index 00000000..b844ec13 --- /dev/null +++ b/template/src/oj/problem/contest_problem.html @@ -0,0 +1,42 @@ +{% extends 'oj_base.html' %} +{% block title %} + {{ problem.title }} +{% endblock %} +{% block body %} +
+ + {% include "oj/problem/_problem_header.html" %} +
+ {% include "oj/problem/_problem_main_info.html" %} + {% if problem.hint %} +
+ + +
{{ problem.hint|safe }}
+
+ {% endif %} + {% if show_submit_code_area %} + {% include "oj/problem/_submit_problem.html" %} + {% endif %} + {% if show_warning %} + + {% endif %} +
+
+
+
+
+{% endblock %} +{% block js_block %} + +{% endblock %} \ No newline at end of file diff --git a/template/src/oj/problem/problem.html b/template/src/oj/problem/problem.html index d7c360b2..0d245663 100644 --- a/template/src/oj/problem/problem.html +++ b/template/src/oj/problem/problem.html @@ -15,35 +15,7 @@ {% include "oj/problem/_problem_header.html" %}
-
- - -
{{ problem.description|safe }}
-
-
- - -

{{ problem.input_description }}

-
-
- - -

{{ problem.output_description }}

-
- {% for item in samples %} -
- - 复制 - 
-{{ item.input }}
- -
-
- - 
-{{ item.output }}
-
- {% endfor %} + {% include "oj/problem/_problem_main_info.html" %}
@@ -67,31 +39,7 @@
{{ problem.source }}
{% endif %} -
- -
- - - -
-
-
- - -
-
-
- - -
+ {% include "oj/problem/submit_problem.html" %}
diff --git a/template/src/oj/problem/my_submission.html b/template/src/oj/submission/my_submission.html similarity index 100% rename from template/src/oj/problem/my_submission.html rename to template/src/oj/submission/my_submission.html diff --git a/template/src/oj/problem/my_submissions_list.html b/template/src/oj/submission/problem_my_submissions_list.html similarity index 70% rename from template/src/oj/problem/my_submissions_list.html rename to template/src/oj/submission/problem_my_submissions_list.html index faa9d628..5931601d 100644 --- a/template/src/oj/problem/my_submissions_list.html +++ b/template/src/oj/submission/problem_my_submissions_list.html @@ -7,10 +7,19 @@ {% load submission %}
{% include "oj/problem/_problem_header.html" %} {% if submissions %}