[合并-dev]并修复冲突 contest/views.py

contest/decorators.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 from functools import wraps
 
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.timezone import now
 
@@ -30,7 +30,7 @@ def check_user_contest_permission(func):
             if request.is_ajax():
                 return error_response(u"请先登录")
             else:
-                return error_page(request, u"请先登录")
+                return HttpResponseRedirect("/login/")
 
         # kwargs 就包含了url 里面的播或参数
         if "contest_id" in kwargs:

contest/migrations/0005_contestsubmission.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contest', '0004_remove_contestproblem_difficulty'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ContestSubmission',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('total_submission_number', models.IntegerField(default=1)),
+                ('ac', models.BooleanField()),
+                ('total_time', models.IntegerField(default=0)),
+                ('contest', models.ForeignKey(to='contest.Contest')),
+                ('problem', models.ForeignKey(to='contest.ContestProblem')),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'contest_submission',
+            },
+        ),
+    ]

contest/models.py

@@ -59,3 +59,20 @@ class ContestProblemTestCase(models.Model):
 
     class Meta:
         db_table = "contest_problem_test_case"
+
+
+class ContestSubmission(models.Model):
+    """
+    用于保存比赛提交和排名的一些数据，加快检索速度
+    """
+    user = models.ForeignKey(User)
+    problem = models.ForeignKey(ContestProblem)
+    contest = models.ForeignKey(Contest)
+    total_submission_number = models.IntegerField(default=1)
+    # 这道题是 AC 还是没过
+    ac = models.BooleanField()
+    # 总的时间，用于acm 类型的，也需要保存罚时
+    total_time = models.IntegerField(default=0)
+
+    class Meta:
+        db_table = "contest_submission"

contest/views.py

@@ -17,7 +17,7 @@ from account.decorators import login_required
 from group.models import Group
 from announcement.models import Announcement
 
-from .models import Contest, ContestProblem
+from .models import Contest, ContestProblem, ContestSubmission
 from .decorators import check_user_contest_permission
 from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer,
                           CreateContestProblemSerializer, ContestProblemSerializer,
@@ -284,6 +284,40 @@ def contest_page(request, contest_id):
     return render(request, "oj/contest/contest_index.html", {"contest": contest})
 
 
+@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:
+        return error_page(request, u"比赛不存在")
+    try:
+        contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
+    except ContestProblem.DoesNotExist:
+        return error_page(request, u"比赛题目不存在")
+    show_warning = False
+    try:
+        submission = ContestSubmission.objects.get(user=request.user, contest=contest, problem=contest_problem)
+        show_warning = submission.ac
+    except ContestSubmission.DoesNotExist:
+        pass
+    return render(request, "oj/contest/contest_problem.html", {"contest_problem": contest_problem,
+                                                               "samples": json.loads(contest_problem.samples),
+                                                               "show_warning": show_warning})
+
+
+@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:
+        return error_page(request, u"比赛题目不存在")
+    # 右侧的公告列表
+    announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
+    return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems,
+                                                                     "announcements": announcements,
+                                                                     "contest": {"id": contest_id}})
+
+
 def contest_list_page(request, page=1):
     # 正常情况
     contests = Contest.objects.filter(visible=True)
@@ -319,10 +353,10 @@ def contest_list_page(request, page=1):
 
     # 右侧的公告列表
     announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
-    # 系统当前时间
-    now = datetime.datetime.now()
+
     return render(request, "oj/contest/contest_list.html",
                   {"contests": current_page, "page": int(page),
                    "previous_page": previous_page, "next_page": next_page,
                    "keyword": keyword, "announcements": announcements,
-                   "join": join, "now": now})
+                   "join": join})
+