From 48eb2d1e9bfe8d6b9f00b2fdbfcd671aadf028ca Mon Sep 17 00:00:00 2001 From: hohoTT <609029365@qq.com> Date: Mon, 24 Aug 2015 21:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=AF=94=E8=B5=9B=E3=80=81?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E9=A2=98=E7=9B=AE=E4=B8=8E=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E7=9A=84=E4=B8=80=E7=B3=BB=E5=88=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/views.py | 12 ++ contest_submission/__init__.py | 0 contest_submission/admin.py | 3 + contest_submission/migrations/__init__.py | 0 contest_submission/models.py | 3 + contest_submission/serializers.py | 11 ++ contest_submission/tests.py | 3 + contest_submission/views.py | 117 +++++++++++++++++ oj/settings.py | 1 + oj/urls.py | 81 +++++++----- static/src/css/oj.css | 2 +- submission/serializers.py | 5 - submission/tests.py | 104 ++++++++++++++- submission/views.py | 82 ++++-------- template/oj/contest/contest_problem.html | 2 +- .../oj/contest/contest_problems_list.html | 122 ++++++++---------- template/oj/contest/my_submission.html | 71 ++++++++++ template/oj/contest/my_submissions_list.html | 12 +- template/oj/contest/submissions_list.html | 80 ++++++++++++ template/oj/problem/my_submission.html | 15 ++- template/oj/problem/my_submissions_list.html | 10 +- template/oj/problem/problem.html | 2 +- .../oj/submission/my_submissions_list.html | 4 +- template/oj_base.html | 2 +- 24 files changed, 554 insertions(+), 190 deletions(-) create mode 100644 contest_submission/__init__.py create mode 100644 contest_submission/admin.py create mode 100644 contest_submission/migrations/__init__.py create mode 100644 contest_submission/models.py create mode 100644 contest_submission/serializers.py create mode 100644 contest_submission/tests.py create mode 100644 contest_submission/views.py create mode 100644 template/oj/contest/my_submission.html create mode 100644 template/oj/contest/submissions_list.html diff --git a/contest/views.py b/contest/views.py index 42ecd62e..8134dca0 100644 --- a/contest/views.py +++ b/contest/views.py @@ -255,6 +255,9 @@ class ContestPasswordVerifyAPIView(APIView): @check_user_contest_permission def contest_page(request, contest_id): + """ + 单个比赛的详情页 + """ try: contest = Contest.objects.get(id=contest_id) except Contest.DoesNotExist: @@ -265,6 +268,9 @@ def contest_page(request, contest_id): @check_user_contest_permission def contest_problem_page(request, contest_id, contest_problem_id): + """ + 单个比赛题目的详情页 + """ try: contest = Contest.objects.get(id=contest_id) except Contest.DoesNotExist: @@ -286,6 +292,9 @@ def contest_problem_page(request, contest_id, contest_problem_id): @check_user_contest_permission def contest_problems_list_page(request, contest_id): + """ + 比赛所有题目的列表页 + """ try: contest_problems = ContestProblem.objects.filter(contest=Contest.objects.get(id=contest_id)).order_by("sort_index") except Contest.DoesNotExist: @@ -298,6 +307,9 @@ def contest_problems_list_page(request, contest_id): def contest_list_page(request, page=1): + """ + 所有比赛的列表页 + """ # 正常情况 contests = Contest.objects.filter(visible=True) diff --git a/contest_submission/__init__.py b/contest_submission/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/contest_submission/admin.py b/contest_submission/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/contest_submission/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/contest_submission/migrations/__init__.py b/contest_submission/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/contest_submission/models.py b/contest_submission/models.py new file mode 100644 index 00000000..71a83623 --- /dev/null +++ b/contest_submission/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/contest_submission/serializers.py b/contest_submission/serializers.py new file mode 100644 index 00000000..eb9a8608 --- /dev/null +++ b/contest_submission/serializers.py @@ -0,0 +1,11 @@ +# coding=utf-8 +from rest_framework import serializers + +from account.models import User + + +class CreateContestSubmissionSerializer(serializers.Serializer): + contest_id = serializers.IntegerField() + problem_id = serializers.IntegerField() + language = serializers.IntegerField() + code = serializers.CharField(max_length=3000) diff --git a/contest_submission/tests.py b/contest_submission/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/contest_submission/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/contest_submission/views.py b/contest_submission/views.py new file mode 100644 index 00000000..192e331a --- /dev/null +++ b/contest_submission/views.py @@ -0,0 +1,117 @@ +# coding=utf-8 +import json + +import redis +from django.shortcuts import render +from django.core.paginator import Paginator + +from rest_framework.views import APIView + +from judge.judger_controller.tasks import judge +from judge.judger_controller.settings import redis_config +from account.decorators import login_required +from account.models import SUPER_ADMIN + +from contest.decorators import check_user_contest_permission + +from problem.models import Problem +from contest.models import Contest, ContestProblem + +from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate + +from submission.models import Submission +from .serializers import CreateContestSubmissionSerializer + + +class ContestSubmissionAPIView(APIView): + @check_user_contest_permission + def post(self, request): + """ + 创建比赛的提交 + --- + request_serializer: CreateContestSubmissionSerializer + """ + serializer = CreateContestSubmissionSerializer(data=request.data) + if serializer.is_valid(): + data = serializer.data + try: + contest = Contest.objects.get(id=data["contest_id"]) + except Contest.DoesNotExist: + return error_response(u"比赛不存在") + try: + problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"]) + # 更新题目提交计数器 + problem.total_submit_number += 1 + problem.save() + except Problem.DoesNotExist: + return error_response(u"题目不存在") + + submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]), + contest_id=contest.id, code=data["code"], problem_id=problem.id) + try: + judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) + except Exception: + return error_response(u"提交判题任务失败") + + # 增加redis 中判题队列长度的计数器 + r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"]) + r.incr("judge_queue_length") + + return success_response({"submission_id": submission.id}) + + else: + return serializer_invalid_response(serializer) + + +@login_required +def contest_problem_my_submissions_list_page(request, contest_id, contest_problem_id): + """ + 我比赛单个题目的所有提交列表 + """ + try: + Contest.objects.get(id=contest_id) + except Contest.DoesNotExist: + return error_page(request, u"比赛不存在") + try: + contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) + except Problem.DoesNotExist: + return error_page(request, u"比赛问题不存在") + 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", + {"submissions": submissions, "problem": contest_problem}) + + +@login_required +def contest_problem_submissions_list_page(request, contest_id, page=1): + """ + 单个比赛中的所有提交（包含自己和别人，自己可查提交结果，其他人不可查） + """ + try: + contest = Contest.objects.get(id=contest_id) + except Contest.DoesNotExist: + return error_page(request, u"比赛不存在") + # 以下是本场比赛中所有的提交 + submissions = Submission.objects.filter(contest_id=contest_id). \ + values("id", "result", "create_time", "accepted_answer_time", "language", "user_id").order_by("-create_time") + paginator = Paginator(submissions, 20) + try: + current_page = paginator.page(int(page)) + except Exception: + return error_page(request, u"不存在的页码") + previous_page = next_page = None + try: + previous_page = current_page.previous_page_number() + except Exception: + pass + try: + next_page = current_page.next_page_number() + except Exception: + pass + + print current_page + + return render(request, "oj/contest/submissions_list.html", + {"submissions": current_page, "page": int(page), + "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, + "contest": contest}) \ No newline at end of file diff --git a/oj/settings.py b/oj/settings.py index 5703566b..c3883ae0 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -54,6 +54,7 @@ INSTALLED_APPS = ( 'submission', 'mq', 'contest', + 'contest_submission', 'django_extensions', 'rest_framework', diff --git a/oj/urls.py b/oj/urls.py index c1b3a573..465e1a64 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -16,48 +16,44 @@ from group.views import (GroupAdminAPIView, GroupMemberAdminAPIView, from admin.views import AdminTemplateView from problem.views import TestCaseUploadAPIView, ProblemTagAdminAPIView, ProblemAdminAPIView -from submission.views import SubmissionAPIView, SubmissionAdminAPIView, ContestSubmissionAPIView +from submission.views import SubmissionAPIView, SubmissionAdminAPIView +from contest_submission.views import ContestSubmissionAPIView from monitor.views import QueueLengthMonitorAPIView +from contest_submission.views import contest_problem_my_submissions_list_page + urlpatterns = [ url(r'^install/$', "install.views.install"), url("^$", TemplateView.as_view(template_name="oj/index.html"), name="index_page"), url(r'^docs/', include('rest_framework_swagger.urls')), url(r'^admin/$', TemplateView.as_view(template_name="admin/admin.html"), name="admin_spa_page"), + url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/contest/add_contest.html"), + name="add_contest_page"), + url(r'^admin/template/(?P\w+)/(?P\w+).html$', AdminTemplateView.as_view(), + name="admin_template"), + url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"), url(r'^register/$', TemplateView.as_view(template_name="oj/account/register.html"), name="user_register_page"), url(r'^change_password/$', TemplateView.as_view(template_name="oj/account/change_password.html"), name="user_change_password_page"), + url(r'^announcement/(?P\d+)/$', "announcement.views.announcement_page", + name="announcement_page"), + url(r'^api/user/$', UserInfoAPIView.as_view(), name="user_info_api"), url(r'^api/login/$', UserLoginAPIView.as_view(), name="user_login_api"), url(r'^api/register/$', UserRegisterAPIView.as_view(), name="user_register_api"), url(r'^api/change_password/$', UserChangePasswordAPIView.as_view(), name="user_change_password_api"), url(r'^api/username_check/$', UsernameCheckAPIView.as_view(), name="username_check_api"), url(r'^api/email_check/$', EmailCheckAPIView.as_view(), name="email_check_api"), + url(r'^api/contest/password/$', ContestPasswordVerifyAPIView.as_view(), name="contest_password_verify_api"), + url(r'^api/contest/submission/$', ContestSubmissionAPIView.as_view(), name="contest_submission_api"), + url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"), + url(r'^api/admin/announcement/$', AnnouncementAdminAPIView.as_view(), name="announcement_admin_api"), url(r'^api/admin/contest/$', ContestAdminAPIView.as_view(), name="contest_admin_api"), url(r'^api/admin/user/$', UserAdminAPIView.as_view(), name="user_admin_api"), - url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), - url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), - - url(r'^contest/(?P\d+)/problem/(?P\d+)/$', "contest.views.contest_problem_page", - name="contest_problem_page"), - - url(r'^contest/(?P\d+)/$', "contest.views.contest_page", name="contest_page"), - url(r'^contest/(?P\d+)/problems/$', "contest.views.contest_problems_list_page", - name="contest_problems_list_page"), - url(r'^announcement/(?P\d+)/$', "announcement.views.announcement_page", - name="announcement_page"), - url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/contest/add_contest.html"), - name="add_contest_page"), - url(r'^problems/$', "problem.views.problem_list_page", name="problem_list_page"), - url(r'^problems/(?P\d+)/$', "problem.views.problem_list_page", name="problem_list_page"), - url(r'^contests/$', "contest.views.contest_list_page", name="contest_list_page"), - url(r'^contests/(?P\d+)/$', "contest.views.contest_list_page", name="contest_list_page"), - url(r'^admin/template/(?P\w+)/(?P\w+).html$', AdminTemplateView.as_view(), - name="admin_template"), url(r'^api/admin/group/$', GroupAdminAPIView.as_view(), name="group_admin_api"), url(r'^api/admin/group_member/$', GroupMemberAdminAPIView.as_view(), name="group_member_admin_api"), url(r'^api/admin/group_join/$', JoinGroupAPIView.as_view(), name="group_join_admin_api"), @@ -65,23 +61,42 @@ urlpatterns = [ url(r'^api/admin/contest_problem/$', ContestProblemAdminAPIView.as_view(), name="contest_problem_admin_api"), url(r'^api/admin/test_case_upload/$', TestCaseUploadAPIView.as_view(), name="test_case_upload_api"), url(r'^api/admin/tag/$', ProblemTagAdminAPIView.as_view(), name="problem_tag_admin_api"), - url(r'^problem/(?P\d+)/my_submissions/$', "submission.views.problem_my_submissions_list_page", - name="problem_my_submissions_page"), - - url(r'^contest/(?P\d+)/problem/(?P\d+)/my_submissions/$', - "submission.views.contest_problem_my_submissions_list_page", name="contest_problem_my_submissions_list_page"), - - url(r'^my_submission/(?P\w+)/$', "submission.views.my_submission", name="my_submission_page"), - url(r'^api/admin/join_group_request/$', JoinGroupRequestAdminAPIView.as_view(), name="join_group_request_admin_api"), - url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"), url(r'^api/admin/submission/$', SubmissionAdminAPIView.as_view(), name="submission_admin_api_view"), - url(r'^my_submissions/$', "submission.views.my_submission_list_page", name="my_submission_list_page"), - url(r'^my_submissions/(?P\d+)/$', "submission.views.my_submission_list_page", name="my_submission_list_page"), url(r'^api/admin/monitor/$', QueueLengthMonitorAPIView.as_view(), name="queue_length_monitor_api"), + + + + url(r'^contest/(?P\d+)/problem/(?P\d+)/$', "contest.views.contest_problem_page", + name="contest_problem_page"), + url(r'^contest/(?P\d+)/problem/(?P\d+)/submissions/$', + "contest_submission.views.contest_problem_my_submissions_list_page", + name="contest_problem_my_submissions_list_page"), + url(r'^contest/(?P\d+)/$', "contest.views.contest_page", name="contest_page"), - url(r'^api/contest/password/$', ContestPasswordVerifyAPIView.as_view(), name="contest_password_verify_api"), - url(r'^api/contest/submission/$', ContestSubmissionAPIView.as_view(), name="contest_submission_api"), + url(r'^contest/(?P\d+)/problems/$', "contest.views.contest_problems_list_page", + name="contest_problems_list_page"), + url(r'^contest/(?P\d+)/submissions/$', "contest_submission.views.contest_problem_submissions_list_page", + name="contest_problem_submissions_list_page"), + url(r'^contest/(?P\d+)/submissions/(?P\d+)/$', + "contest_submission.views.contest_problem_submissions_list_page", name="contest_problem_submissions_list_page"), + + url(r'^contests/$', "contest.views.contest_list_page", name="contest_list_page"), + url(r'^contests/(?P\d+)/$', "contest.views.contest_list_page", name="contest_list_page"), + url(r'^contest/(?P\d+)/$', "contest.views.contest_page", name="contest_page"), + + + url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), + url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), + url(r'^problems/$', "problem.views.problem_list_page", name="problem_list_page"), + url(r'^problems/(?P\d+)/$', "problem.views.problem_list_page", name="problem_list_page"), + url(r'^problem/(?P\d+)/submissions/$', "submission.views.problem_my_submissions_list_page", + name="problem_my_submissions_page"), + + + url(r'^submission/(?P\w+)/$', "submission.views.my_submission", name="my_submission_page"), + url(r'^submissions/$', "submission.views.my_submission_list_page", name="my_submission_list_page"), + url(r'^submissions/(?P\d+)/$', "submission.views.my_submission_list_page", name="my_submission_list_page"), ] diff --git a/static/src/css/oj.css b/static/src/css/oj.css index ce1bc0e4..e0998357 100644 --- a/static/src/css/oj.css +++ b/static/src/css/oj.css @@ -90,5 +90,5 @@ li.list-group-item { } .contest-tab{ - margin-bottom: 5px; + margin-bottom: 15px; } \ No newline at end of file diff --git a/submission/serializers.py b/submission/serializers.py index 545c13af..81704860 100644 --- a/submission/serializers.py +++ b/submission/serializers.py @@ -22,8 +22,3 @@ class SubmissionSerializer(serializers.ModelSerializer): return User.objects.get(id=obj.user_id).username -class CreateContestSubmissionSerializer(serializers.Serializer): - contest_id = serializers.IntegerField() - problem_id = serializers.IntegerField() - language = serializers.IntegerField() - code = serializers.CharField(max_length=3000) \ No newline at end of file diff --git a/submission/tests.py b/submission/tests.py index c31741bc..a9b6de13 100644 --- a/submission/tests.py +++ b/submission/tests.py @@ -1,5 +1,10 @@ +# coding=utf-8 +import json from django.test import TestCase -from account.models import User, REGULAR_USER +from django.core.urlresolvers import reverse +from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN +from problem.models import Problem +from contest.models import Contest from submission.models import Submission from rest_framework.test import APITestCase, APIClient @@ -12,6 +17,7 @@ class SubmissionsListPageTest(TestCase): self.user2.set_password("666666") self.user.set_password("666666") self.user.save() + self.user2.save() # self.client.login(username="gogoing", password="666666") self.submission = Submission.objects.create(user_id=self.user.id, language=1, @@ -42,3 +48,99 @@ class SubmissionsListPageTest(TestCase): self.client.login(username="cool", password="666666") response = self.client.get('/my_submissions/') self.assertEqual(response.status_code, 200) + + +class SubmissionAPITest(APITestCase): + def setUp(self): + self.client = APIClient() + self.url = reverse('submission_api') + self.user1 = User.objects.create(username="test1", admin_type=REGULAR_USER) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=SUPER_ADMIN) + self.user2.set_password("testbb") + self.user2.save() + self.problem = Problem.objects.create(title="title1", + description="description1", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + source="source1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + difficulty=1, + hint="hint1", + created_by=User.objects.get(username="test2")) + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test2")) + + self.submission = Submission.objects.create(user_id=self.user1.id, + language=1, + code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', + problem_id=self.problem.id) + + def test_invalid_format(self): + self.client.login(username="test1", password="testaa") + data = {"language": 1} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 1) + + def test_problem_does_not_exist(self): + self.client.login(username="test1", password="testaa") + data = {"language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}', + "problem_id": self.problem.id + 10} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) + + def test_submission_successfully(self): + self.client.login(username="test1", password="testaa") + data = {"language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}', + "problem_id": self.problem.id} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 0) + + def test_submission_does_not_exist(self): + self.client.login(username="test1", password="testaa") + data = {"submission_id": self.submission.id + "111"} + response = self.client.get(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"提交不存在"}) + + def test_get_submission_successfully(self): + self.client.login(username="test1", password="testaa") + data = {"submission_id": self.submission.id} + response = self.client.get(self.url, data=data) + self.assertEqual(response.data["code"], 0) + + +class ContestSubmissionAPITest(APITestCase): + def setUp(self): + self.client = APIClient() + self.url = reverse('contest_submission_api') + self.user1 = User.objects.create(username="test1", admin_type=REGULAR_USER) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=SUPER_ADMIN) + self.user2.set_password("testbb") + self.user2.save() + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test2")) + + def test_invalid_format(self): + self.client.login(username="test1", password="testaa") + data = {"language": 1} + response = self.client.post(self.url, data=data) + pass + + + + + + + diff --git a/submission/views.py b/submission/views.py index 6399e22b..918ad58d 100644 --- a/submission/views.py +++ b/submission/views.py @@ -19,7 +19,7 @@ from contest.models import Contest, ContestProblem from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate from .models import Submission -from .serializers import CreateSubmissionSerializer, SubmissionSerializer, CreateContestSubmissionSerializer +from .serializers import CreateSubmissionSerializer, SubmissionSerializer class SubmissionAPIView(APIView): @@ -73,34 +73,24 @@ class SubmissionAPIView(APIView): @login_required def problem_my_submissions_list_page(request, problem_id): + """ + 我单个题目所有提交的列表页 + """ try: problem = Problem.objects.get(id=problem_id, visible=True) except Problem.DoesNotExist: return error_page(request, u"问题不存在") - submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).order_by("-create_time"). \ + submissions = Submission.objects.filter(user_id=request.user.id, problem_id=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", {"submissions": submissions, "problem": problem}) -@login_required -def contest_problem_my_submissions_list_page(request, contest_id, contest_problem_id): - try: - Contest.objects.get(id=contest_id) - except Contest.DoesNotExist: - return error_page(request, u"比赛不存在") - try: - contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) - except Problem.DoesNotExist: - return error_page(request, u"比赛问题不存在") - 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", - {"submissions": submissions, "contest_problem": contest_problem}) - - @login_required def my_submission(request, submission_id): + """ + 单个题目的提交详情页 + """ try: # 超级管理员可以查看所有的提交 if request.user.admin_type != SUPER_ADMIN: @@ -110,10 +100,18 @@ def my_submission(request, submission_id): except Submission.DoesNotExist: return error_page(request, u"提交不存在") - try: - problem = Problem.objects.get(id=submission.problem_id, visible=True) - except Problem.DoesNotExist: - return error_page(request, u"提交不存在") + if submission.contest_id: + try: + problem = ContestProblem.objects.get(id=submission.problem_id, + visible=True) + except ContestProblem.DoesNotExist: + return error_page(request, u"提交不存在") + else: + try: + problem = Problem.objects.get(id=submission.problem_id, visible=True) + except Problem.DoesNotExist: + return error_page(request, u"提交不存在") + if submission.info: try: info = json.loads(submission.info) @@ -136,6 +134,9 @@ class SubmissionAdminAPIView(APIView): @login_required def my_submission_list_page(request, page=1): + """ + 我的所有提交的列表页 + """ submissions = Submission.objects.filter(user_id=request.user.id). \ values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time") paginator = Paginator(submissions, 20) @@ -158,41 +159,4 @@ def my_submission_list_page(request, page=1): "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20}) -class ContestSubmissionAPIView(APIView): - @check_user_contest_permission - def post(self, request): - """ - 创建比赛的提交 - --- - request_serializer: ConestSubmissionSerializer - """ - serializer = CreateContestSubmissionSerializer(data=request.data) - if serializer.is_valid(): - data = serializer.data - try: - contest = Contest.objects.get(id=data["contest_id"]) - except Contest.DoesNotExist: - return error_response(u"比赛不存在") - try: - problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"]) - # 更新题目提交计数器 - problem.total_submit_number += 1 - problem.save() - except Problem.DoesNotExist: - return error_response(u"题目不存在") - submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]), - contest_id=contest.id, code=data["code"], problem_id=problem.id) - try: - judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) - except Exception: - return error_response(u"提交判题任务失败") - - # 增加redis 中判题队列长度的计数器 - r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"]) - r.incr("judge_queue_length") - - return success_response({"submission_id": submission.id}) - - else: - return serializer_invalid_response(serializer) diff --git a/template/oj/contest/contest_problem.html b/template/oj/contest/contest_problem.html index 32b0617a..cbea9944 100644 --- a/template/oj/contest/contest_problem.html +++ b/template/oj/contest/contest_problem.html @@ -6,7 +6,7 @@

{{ contest_problem.title }}

diff --git a/template/oj/contest/contest_problems_list.html b/template/oj/contest/contest_problems_list.html index 23cefd71..4dd68c59 100644 --- a/template/oj/contest/contest_problems_list.html +++ b/template/oj/contest/contest_problems_list.html @@ -1,82 +1,66 @@ {% extends "oj_base.html" %} {% block body %} - {% load problem %} -
+{% load problem %} +
-
-
+
+
- -
- -
- -
- - - - - - - - - - - {% for item in contest_problems %} - - - - - - - {% endfor %} - -
#题目通过率
- - - {{ item.sort_index }} - - {{ item.title }} - {{ item|accepted_radio }}
- -
-
-
- {% include "oj/announcement/_announcement_panel.html" %} -
+
+ + +
+
+ + + + + + + + + + + {% for item in contest_problems %} + + + + + + + {% endfor %} + +
#题目通过率
{{ item.sort_index }} + {{ item.title }} + {{ item|accepted_radio }}
+ +
+
+
+ {% include "oj/announcement/_announcement_panel.html" %} +
+
{% endblock %} {% block js_block %} - + {% endblock %} \ No newline at end of file diff --git a/template/oj/contest/my_submission.html b/template/oj/contest/my_submission.html new file mode 100644 index 00000000..ed26b9e6 --- /dev/null +++ b/template/oj/contest/my_submission.html @@ -0,0 +1,71 @@ +{% extends 'oj_base.html' %} +{% 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/oj/contest/my_submissions_list.html b/template/oj/contest/my_submissions_list.html index dc4f5f53..fb24befc 100644 --- a/template/oj/contest/my_submissions_list.html +++ b/template/oj/contest/my_submissions_list.html @@ -6,17 +6,13 @@
-

{{ contest_problem.title }}

- -

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

+ {% include "oj/problem/_problem_header.html" %} @@ -30,7 +26,7 @@ {% for item in submissions %} - +
{{ forloop.counter }}{{ forloop.counter }} {{ item.create_time }} {{ item.result|translate_result }} diff --git a/template/oj/contest/submissions_list.html b/template/oj/contest/submissions_list.html new file mode 100644 index 00000000..66352199 --- /dev/null +++ b/template/oj/contest/submissions_list.html @@ -0,0 +1,80 @@ +{% extends 'oj_base.html' %} + +{% block body %} + +{% load submission %} +
+
+ +
+ {% if submissions %} + + + + + + + + + + + + {% for item in submissions %} + + + {% ifequal item.user_id request.user.id %} + + {% else %} + + {% endifequal %} + + + + + + + {% endfor %} + + +
#提交时间结果运行时间语言
+ {{ forloop.counter |add:start_id }}{{ forloop.counter |add:start_id }}{{ item.create_time }}{{ item.result|translate_result }} + {% if item.accepted_answer_time %} + {{ item.accepted_answer_time }}ms + {% else %} + -- + {% endif %} + + {{ item.language|translate_language }} +
+ {% else %} +

你还没有提交记录!

+ {% endif %} + +
+{% endblock %} diff --git a/template/oj/problem/my_submission.html b/template/oj/problem/my_submission.html index 1aca690d..2e361f53 100644 --- a/template/oj/problem/my_submission.html +++ b/template/oj/problem/my_submission.html @@ -11,8 +11,19 @@
{% include "oj/problem/_problem_header.html" %}
diff --git a/template/oj/problem/my_submissions_list.html b/template/oj/problem/my_submissions_list.html index 8a9a235f..fb07a4cc 100644 --- a/template/oj/problem/my_submissions_list.html +++ b/template/oj/problem/my_submissions_list.html @@ -8,13 +8,9 @@
  • 题目
    • + 我的提交 -

    {{ problem.title }}

    - -

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

    + {% include "oj/problem/_problem_header.html" %} @@ -28,7 +24,7 @@ {% for item in submissions %} - +
    {{ forloop.counter }}{{ forloop.counter }} {{ item.create_time }} {{ item.result|translate_result }} diff --git a/template/oj/problem/problem.html b/template/oj/problem/problem.html index 5a7d8474..2efd86ad 100644 --- a/template/oj/problem/problem.html +++ b/template/oj/problem/problem.html @@ -5,7 +5,7 @@ {% include "oj/problem/_problem_header.html" %} diff --git a/template/oj/submission/my_submissions_list.html b/template/oj/submission/my_submissions_list.html index 4b939ece..279bee67 100644 --- a/template/oj/submission/my_submissions_list.html +++ b/template/oj/submission/my_submissions_list.html @@ -44,12 +44,12 @@ diff --git a/template/oj_base.html b/template/oj_base.html index 61b887ab..082cad5b 100644 --- a/template/oj_base.html +++ b/template/oj_base.html @@ -43,7 +43,7 @@