From 3e7dfa9dc8c343bd589c0db7a47dc16c29e86d51 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Wed, 26 Aug 2015 16:59:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=BF=98=E6=9C=89=E8=A6=81=E5=AE=8C=E5=96=84=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9,=20=20contest=E3=80=81=E8=BF=98=E6=9C=89=E7=B1=BB?=
 =?UTF-8?q?=E4=BC=BC=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest/test_urls.py                          |   9 +
 contest/tests.py                              | 176 +++++++++++++++++-
 contest/views.py                              |  16 +-
 contest_submission/tests.py                   |  89 ++++++++-
 contest_submission/views.py                   |   9 +-
 static/src/js/app/oj/problem/problem.js       |   2 +-
 submission/tests.py                           |  91 +++++++--
 .../oj/submission/my_submissions_list.html    |   2 +-
 8 files changed, 353 insertions(+), 41 deletions(-)
 create mode 100644 contest/test_urls.py

diff --git a/contest/test_urls.py b/contest/test_urls.py
new file mode 100644
index 00000000..234c600f
--- /dev/null
+++ b/contest/test_urls.py
@@ -0,0 +1,9 @@
+# coding=utf-8
+from django.conf.urls import include, url
+from django.views.generic import TemplateView
+
+
+urlpatterns = [
+
+    url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"),
+]
diff --git a/contest/tests.py b/contest/tests.py
index 58c9127a..2063c4e2 100644
--- a/contest/tests.py
+++ b/contest/tests.py
@@ -1,15 +1,18 @@
 # coding=utf-8
 import json
 from django.core.urlresolvers import reverse
-from django.test import TestCase
+from django.test import TestCase, Client
+from django.http import HttpResponse
 
 from rest_framework.test import APITestCase, APIClient
 
 from account.models import User
 from group.models import Group
 from contest.models import Contest, ContestProblem
+from .models import ContestSubmission
 from announcement.models import Announcement
 from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN
+from decorators import check_user_contest_permission
 
 
 class ContestAdminAPITest(APITestCase):
@@ -398,3 +401,174 @@ class ContestProblemAdminAPItEST(APITestCase):
         response = self.client.put(self.url, data=data)
         self.assertEqual(response.data["code"], 1)
 
+
+class ContestPasswordVerifyAPITest(APITestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.url = reverse('contest_password_verify_api')
+        self.user = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user.set_password("testaa")
+        self.user.save()
+        self.user2 = User.objects.create(username="test2", admin_type=ADMIN)
+        self.user2.set_password("testbb")
+        self.user2.save()
+        self.client.login(username="test1", password="testaa")
+        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="test1"))
+
+    def test_invalid_format(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 1)
+
+    def test_contest_does_not_exist(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id + 1, "password": "aacc"}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data, {"code": 1, "data": u"比赛不存在"})
+
+    def test_contest_password_verify_unsuccessfully(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id, "password": "aabb"}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data, {"code": 1, "data": u"密码错误"})
+
+    def test_contest_password_verify_successfully(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id, "password": "aacc"}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 0)
+
+
+class ContestPageTest(TestCase):
+    # 单个比赛详情页的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.client.login(username="test1", password="testaa")
+        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="test1"))
+
+    def test_visit_contest_page_successfully(self):
+        response = self.client.get('/contest/1/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_page_unsuccessfully(self):
+        response = self.client.get('/contest/10/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+
+class ContestProblemPageTest(TestCase):
+    # 单个比赛题目详情页的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.client.login(username="test1", password="testaa")
+        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="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=User.objects.get(username="test1"),
+                                                             contest=Contest.objects.get(title="titlex"),
+                                                             sort_index="a")
+
+    def test_visit_contest_problem_page_successfully(self):
+        response = self.client.get('/contest/1/problem/1/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_page_unsuccessfully(self):
+        response = self.client.get('/contest/10/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+    def test_visit_contest_submissions_page_successfully(self):
+        ContestSubmission.objects.create(user=self.user1,
+                                         contest=self.global_contest,
+                                         problem=self.contest_problem,
+                                         ac=True)
+        response = self.client.get('/contest/1/problem/1/submissions/')
+        self.assertEqual(response.status_code, 200)
+
+
+class ContestProblemListPageTest(TestCase):
+    # 比赛题目列表的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.client.login(username="test1", password="testaa")
+        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="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=User.objects.get(username="test1"),
+                                                             contest=Contest.objects.get(title="titlex"),
+                                                             sort_index="a")
+
+    def test_visit_contest_problem_list_page_successfully(self):
+        response = self.client.get('/contest/1/problems/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_problem_page_unsuccessfully(self):
+        response = self.client.get('/contest/1/problem/100/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+
+class ContestListPageTest(TestCase):
+    # 以下是所有比赛列表页的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.url = reverse('contest_list_page')
+        self.client.login(username="test1", password="testaa")
+        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="test1"))
+
+    def test_visit_contest_list_page_successfully(self):
+        response = self.client.get('/contests/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_list_page_unsuccessfully(self):
+        response = self.client.get('/contests/2/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+
+
+
+
diff --git a/contest/views.py b/contest/views.py
index 8c2e29f9..72dffbe1 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -258,10 +258,10 @@ class ContestPasswordVerifyAPIView(APIView):
             try:
                 contest = Contest.objects.get(id=data["contest_id"], contest_type=2)
             except Contest.DoesNotExist:
-                return error_response(u"密码错误")
+                return error_response(u"比赛不存在")
 
             if data["password"] != contest.password:
-                return error_response(u" 密码错误")
+                return error_response(u"密码错误")
             else:
                 if "contests" not in request.session:
                     request.session["contests"] = []
@@ -279,10 +279,7 @@ def contest_page(request, contest_id):
     """
     单个比赛的详情页
     """
-    try:
-        contest = Contest.objects.get(id=contest_id)
-    except Contest.DoesNotExist:
-        return error_page(request, u"比赛不存在")
+    contest = Contest.objects.get(id=contest_id)
 
     return render(request, "oj/contest/contest_index.html", {"contest": contest})
 
@@ -292,10 +289,7 @@ 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"比赛不存在")
+    contest = Contest.objects.get(id=contest_id)
     try:
         contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
     except ContestProblem.DoesNotExist:
@@ -324,7 +318,7 @@ 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:
+    except ContestProblem.DoesNotExist:
         return error_page(request, u"比赛题目不存在")
     # 右侧的公告列表
     announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
diff --git a/contest_submission/tests.py b/contest_submission/tests.py
index 7ce503c2..836df099 100644
--- a/contest_submission/tests.py
+++ b/contest_submission/tests.py
@@ -1,3 +1,88 @@
-from django.test import TestCase
+# coding=utf-8
+import json
+from django.test import TestCase, Client
+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, ContestProblem
+from submission.models import Submission
+from rest_framework.test import APITestCase, APIClient
 
-# Create your tests here.
+
+class ContestSubmissionAPITest(APITestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.url = reverse('contest_submission_api')
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER)
+        self.user2.set_password("testbb")
+        self.user2.save()
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=1, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-30T12:00:00.000Z",
+                                                     created_by=User.objects.get(username="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=User.objects.get(username="test1"),
+                                                             contest=Contest.objects.get(title="titlex"),
+                                                             sort_index="a")
+
+    # 以下是创建比赛的提交
+    def test_invalid_format(self):
+        self.client.login(username="test1", password="testaa")
+        data = {"contest_id": self.global_contest.id, "language": 1}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 1)
+
+    def test_contest_submission_successfully(self):
+        self.client.login(username="test1", password="testaa")
+        data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id,
+                "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 0)
+
+    def test_contest_problem_does_not_exist(self):
+        self.client.login(username="test1", password="testaa")
+        data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id + 10,
+                "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"})
+
+
+class ContestProblemMySubmissionListTest(TestCase):
+    # 以下是我比赛单个题目的提交列表的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER)
+        self.user2.set_password("testbb")
+        self.user2.save()
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=1, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-30T12:00:00.000Z",
+                                                     created_by=User.objects.get(username="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=self.user1,
+                                                             contest=self.global_contest,
+                                                             sort_index="a")
diff --git a/contest_submission/views.py b/contest_submission/views.py
index 0dba7cb4..efab6ad0 100644
--- a/contest_submission/views.py
+++ b/contest_submission/views.py
@@ -34,16 +34,13 @@ class ContestSubmissionAPIView(APIView):
         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"比赛不存在")
+            contest = Contest.objects.get(id=data["contest_id"])
             try:
                 problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"])
                 # 更新题目提交计数器
                 problem.total_submit_number += 1
                 problem.save()
-            except Problem.DoesNotExist:
+            except ContestProblem.DoesNotExist:
                 return error_response(u"题目不存在")
 
             submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]),
@@ -74,7 +71,7 @@ def contest_problem_my_submissions_list_page(request, contest_id, contest_proble
         return error_page(request, u"比赛不存在")
     try:
         contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
-    except Problem.DoesNotExist:
+    except ContestProblem.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")
diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js
index d936e0fd..1faeb6d2 100644
--- a/static/src/js/app/oj/problem/problem.js
+++ b/static/src/js/app/oj/problem/problem.js
@@ -48,7 +48,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
         if (!data.result) {
             html += "CPU time: " + data.accepted_answer_time + "ms &nbsp;&nbsp;";
         }
-        html += ('<a href="/my_submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');
+        html += ('<a href="/submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');
 
         return html;
     }
diff --git a/submission/tests.py b/submission/tests.py
index e745bdea..99bfee9e 100644
--- a/submission/tests.py
+++ b/submission/tests.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 import json
-from django.test import TestCase
+from django.test import TestCase, Client
 from django.core.urlresolvers import reverse
 from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
 from problem.models import Problem
@@ -11,7 +11,7 @@ from rest_framework.test import APITestCase, APIClient
 
 class SubmissionsListPageTest(TestCase):
     def setUp(self):
-        self.client = APIClient()
+        self.client = Client()
         self.user = User.objects.create(username="gogoing", admin_type=REGULAR_USER)
         self.user2 = User.objects.create(username="cool", admin_type=REGULAR_USER)
         self.user2.set_password("666666")
@@ -115,32 +115,85 @@ class SubmissionAPITest(APITestCase):
         response = self.client.get(self.url, data=data)
         self.assertEqual(response.data["code"], 0)
 
+    def test_parameter_error(self):
+        self.client.login(username="test1", password="testaa")
+        response = self.client.get(self.url)
+        self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
 
-class ContestSubmissionAPITest(APITestCase):
+
+class SubmissionAdminAPITest(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.url = reverse('submission_admin_api_view')
+        self.user = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user.set_password("testaa")
+        self.user.save()
+        self.client.login(username="test1", password="testaa")
+        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="test1"))
         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"))
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+
+        self.submission = Submission.objects.create(user_id=self.user.id,
+                                                    language=1,
+                                                    code='#include "stdio.h"\nint main(){\n\treturn 0;\n}',
+                                                    problem_id=self.problem.id)
 
     def test_invalid_format(self):
+        response = self.client.get(self.url)
+        self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
+
+    def test_problem_does_not_exist(self):
+        data = {"problem_id": self.problem.id}
+        response = self.client.get(self.url, data=data)
+        self.assertEqual(response.data["code"], 0)
+
+
+class SubmissionPageTest(TestCase):
+    # 单个题目的提交详情页
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.user2 = User.objects.create(username="test2", admin_type=ADMIN)
+        self.user2.set_password("testbb")
+        self.user2.save()
         self.client.login(username="test1", password="testaa")
-        data = {"language": 1}
-        response = self.client.post(self.url, data=data)
-        pass
-
-
-
-
-
+        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="test1"))
+        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="test1"))
+
+        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)
 
 
diff --git a/template/oj/submission/my_submissions_list.html b/template/oj/submission/my_submissions_list.html
index 279bee67..ce9f0639 100644
--- a/template/oj/submission/my_submissions_list.html
+++ b/template/oj/submission/my_submissions_list.html
@@ -18,7 +18,7 @@
                 <tbody>
                 {% for item in submissions %}
                     <tr class="{{ item.result|translate_result_class }}">
-                        <th scope="row"><a href="/my_submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
+                        <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
                             {{ forloop.counter |add:start_id }}</a></th>
                         <td>{{ item.create_time }}</td>
                         <td>{{ item.result|translate_result }}</td>

From 2252107a8017e58628166cc010f421724e334962 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Sat, 29 Aug 2015 15:20:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 account/tests.py                                   |  2 +-
 contest/tests.py                                   |  7 +++++++
 contest_submission/tests.py                        |  5 +++++
 problem/tests.py                                   | 14 ++++++++++++++
 submission/tests.py                                |  9 ++-------
 .../src/oj/submission/my_submissions_list.html     |  2 +-
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/account/tests.py b/account/tests.py
index f8cc9d06..3473c6c1 100644
--- a/account/tests.py
+++ b/account/tests.py
@@ -379,7 +379,7 @@ class UserLogoutTest(TestCase):
         user.set_password("1")
         user.save()
 
-    def logout_success(self):
+    def test_logout_success(self):
         self.client = Client()
         self.client.login(username="test", password="1")
         response = self.client.get("/logout/")
diff --git a/contest/tests.py b/contest/tests.py
index 2063c4e2..1605e028 100644
--- a/contest/tests.py
+++ b/contest/tests.py
@@ -568,6 +568,13 @@ class ContestListPageTest(TestCase):
         response = self.client.get('/contests/2/')
         self.assertTemplateUsed(response, "utils/error.html")
 
+    def test_query_by_keyword(self):
+        response = self.client.get(self.url + "?keyword=title1")
+        self.assertEqual(response.status_code, 200)
+
+    def test_query_by_join_successfully(self):
+        response = self.client.get(self.url + "?join=True")
+        self.assertEqual(response.status_code, 200)
 
 
 
diff --git a/contest_submission/tests.py b/contest_submission/tests.py
index debd64bd..975d11ca 100644
--- a/contest_submission/tests.py
+++ b/contest_submission/tests.py
@@ -87,6 +87,11 @@ class ContestProblemMySubmissionListTest(TestCase):
                                                              contest=self.global_contest,
                                                              sort_index="a")
 
+    def test_contestsList_page_not_exist(self):
+        self.client.login(username="test1", password="testaa")
+        response = self.client.get('/contest/1/submissions/999/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
 
 class SubmissionAPITest(APITestCase):
     def setUp(self):
diff --git a/problem/tests.py b/problem/tests.py
index ab6d8985..63136958 100644
--- a/problem/tests.py
+++ b/problem/tests.py
@@ -187,5 +187,19 @@ class ProblemListPageTest(TestCase):
                                               hint="hint1",
                                               created_by=User.objects.get(username="test"))
 
+    def test_problemListPage_not_exist(self):
+        response = self.client.get('/problems/999/')
+        self.assertTemplateUsed(response, "utils/error.html")
 
+    def test_query_by_keyword(self):
+        response = self.client.get(self.url + "?keyword=title1")
+        self.assertEqual(response.status_code, 200)
+
+    def test_query_by_tag_successfully(self):
+        response = self.client.get(self.url + "?tag=")
+        self.assertEqual(response.status_code, 200)
+
+    def test_tag_does_not_exists(self):
+        response = self.client.get(self.url + "?tag=xxxxxx")
+        self.assertTemplateUsed(response, "utils/error.html")
 
diff --git a/submission/tests.py b/submission/tests.py
index 80fd1112..bb1d46de 100644
--- a/submission/tests.py
+++ b/submission/tests.py
@@ -150,12 +150,12 @@ class SubmissionAdminAPITest(APITestCase):
                                               memory_limit=1000,
                                               difficulty=1,
                                               hint="hint1",
-                                              created_by=User.objects.get(username="test1"))
+                                              created_by=self.user)
         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="test1"))
+                                                     password="aacc", created_by=self.user)
 
         self.submission = Submission.objects.create(user_id=self.user.id,
                                                     language=1,
@@ -166,11 +166,6 @@ class SubmissionAdminAPITest(APITestCase):
         response = self.client.get(self.url)
         self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
 
-    def test_submission_successfully(self):
-        data = {"problem_id": self.problem.id}
-        response = self.client.get(self.url, data=data)
-        self.assertEqual(response.data["code"], 0)
-
 
 class SubmissionPageTest(TestCase):
     # 单个题目的提交详情页
diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html
index 2ee5b685..41784302 100644
--- a/template/src/oj/submission/my_submissions_list.html
+++ b/template/src/oj/submission/my_submissions_list.html
@@ -41,7 +41,7 @@
             <tbody>
             {% for item in submissions %}
             <tr class="{{ item.result|translate_result_class }}">
-                <th scope="row"><a href="/my_submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
+                <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
                     {{ forloop.counter |add:start_id }}</a></th>
                 <td>{{ item.create_time }}</td>
                 <td>{{ item.result|translate_result }}</td>

From 69b80ef448f317157cd0f5d81bd092fb4bfdf3c6 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Mon, 7 Sep 2015 21:07:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86dev-hohoTT=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=94=B9=E5=88=B0hohoTT-dev?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=90=88=E5=B9=B6dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest_submission/views.py                   | 35 ++++++----
 submission/views.py                           |  2 +-
 .../src/oj/contest/my_submissions_list.html   | 14 ++--
 template/src/oj/contest/submissions_list.html | 64 ++++++++++++++-----
 template/src/oj/problem/problem.html          | 18 +++---
 .../oj/submission/my_submissions_list.html    | 11 +++-
 6 files changed, 95 insertions(+), 49 deletions(-)

diff --git a/contest_submission/views.py b/contest_submission/views.py
index d749fcfb..f136245f 100644
--- a/contest_submission/views.py
+++ b/contest_submission/views.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 import json
-
 import redis
 from django.shortcuts import render
 from django.core.paginator import Paginator
@@ -9,16 +8,15 @@ 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
 from submission.serializers import SubmissionSerializer
@@ -43,20 +41,16 @@ class ContestSubmissionAPIView(APIView):
                 problem.save()
             except ContestProblem.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)
 
@@ -92,8 +86,26 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
         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")
+        values("id", "contest_id", "problem_id", "result", "create_time", "accepted_answer_time", "language", "user_id").order_by("-create_time")
+    language = request.GET.get("language", None)
+    filter = None
+    if language:
+        submissions = submissions.filter(language=int(language))
+        filter = {"name": "language", "content": language}
+    result = request.GET.get("result", None)
+    if result:
+        submissions = submissions.filter(result=int(result))
+        filter = {"name": "result", "content": result}
     paginator = Paginator(submissions, 20)
+
+    # 为查询题目标题创建新字典
+    title = {}
+    contest_problems = ContestProblem.objects.filter(contest=contest)
+    for item in contest_problems:
+        title[item.id] = item.title
+    for item in submissions:
+        item['title'] = title[item['problem_id']]
+
     try:
         current_page = paginator.page(int(page))
     except Exception:
@@ -107,11 +119,10 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
         next_page = current_page.next_page_number()
     except Exception:
         pass
-
     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})
+                   "contest": contest, "filter":filter})
 
 
 class ContestSubmissionAdminAPIView(APIView):
@@ -144,6 +155,4 @@ class ContestSubmissionAdminAPIView(APIView):
                 return error_response(u"参数错误!")
         if problem_id:
             submissions = submissions.filter(problem_id=problem_id)
-
-        return paginate(request, submissions, SubmissionSerializer)
-
+        return paginate(request, submissions, SubmissionSerializer)
\ No newline at end of file
diff --git a/submission/views.py b/submission/views.py
index 0925e131..6180f8e2 100644
--- a/submission/views.py
+++ b/submission/views.py
@@ -139,7 +139,7 @@ def my_submission_list_page(request, page=1):
     我的所有提交的列表页
     """
     submissions = Submission.objects.filter(user_id=request.user.id, contest_id__isnull=True). \
-        values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
+        values("id", "problem_id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
     language = request.GET.get("language", None)
     filter = None
     if language:
diff --git a/template/src/oj/contest/my_submissions_list.html b/template/src/oj/contest/my_submissions_list.html
index fb24befc..8c8aa5a7 100644
--- a/template/src/oj/contest/my_submissions_list.html
+++ b/template/src/oj/contest/my_submissions_list.html
@@ -18,17 +18,19 @@
             <tr class="" success>
                 <th>#</th>
                 <th>提交时间</th>
-                <th>结果</th>
-                <th>运行时间</th>
                 <th>语言</th>
+                <th>运行时间</th>
+                <th>结果</th>
             </tr>
             </thead>
             <tbody>
             {% for item in submissions %}
-                <tr class="{{ item.result|translate_result_class }}">
+                <tr>
                     <th scope="row"><a href="/submission/{{ item.id }}/">{{ forloop.counter }}</a></th>
                     <td>{{ item.create_time }}</td>
-                    <td>{{ item.result|translate_result }}</td>
+                    <td>
+                        {{ item.language|translate_language }}
+                    </td>
                     <td>
                         {% if item.accepted_answer_time %}
                             {{ item.accepted_answer_time }}ms
@@ -36,8 +38,8 @@
                             --
                         {% endif %}
                     </td>
-                    <td>
-                        {{ item.language|translate_language }}
+                    <td class="alert-{{ item.result|translate_result_class }}">
+                        <strong>{{ item.result|translate_result }}</strong>
                     </td>
                 </tr>
             {% endfor %}
diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html
index 336e9c32..c2653259 100644
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -26,28 +26,61 @@
                 <thead>
                 <tr class="" success>
                     <th>#</th>
-                    <td>用户</td>
+                    <th>题目名称</th>
+                    <th>用户</th>
                     <th>提交时间</th>
-                    <th>结果</th>
+                    <th>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
+                               aria-haspopup="true" aria-expanded="true">
+                                语言<span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="languageFilter">
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=1">C</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=2">C++</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=3">Java</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                            </ul>
+                        </div>
+                    </th>
                     <th>运行时间</th>
-                    <th>语言</th>
+                    <th>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
+                               aria-haspopup="true" aria-expanded="true">
+                                结果<span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="resultFilter">
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=0">Accepted</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=6">Wrong Answer</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=1">Runtime Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=2">Time Limit Exceeded</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=3">Memory Limit Exceeded</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=4">Compile Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=5">Format Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                            </ul>
+                        </div>
+                    </th>
                 </tr>
                 </thead>
                 <tbody>
                 {% for item in submissions %}
-                    <tr class="{{ item.result|translate_result_class }}">
-
+                    <tr>
                         {% ifequal item.user_id request.user.id %}
-                            <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
+                            <th scope="row"><a href="/submission/{{ item.id }}/">
                                 {{ forloop.counter |add:start_id }}</a></th>
                         {% else %}
                             <th scope="row">{{ forloop.counter |add:start_id }}</th>
                         {% endifequal %}
-
+                        <th scope="row">
+                            <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
+                        </th>
                         <td>{{ item.user_id|get_username }}</td>
-
                         <td>{{ item.create_time }}</td>
-                        <td>{{ item.result|translate_result }}</td>
+                        <td>
+                            {{ item.language|translate_language }}
+                        </td>
                         <td>
                             {% if item.accepted_answer_time %}
                                 {{ item.accepted_answer_time }}ms
@@ -55,12 +88,11 @@
                                 --
                             {% endif %}
                         </td>
-                        <td>
-                            {{ item.language|translate_language }}
+                        <td class="alert-{{ item.result|translate_result_class }}">
+                            <strong>{{ item.result|translate_result }}</strong>
                         </td>
                     </tr>
                 {% endfor %}
-
                 </tbody>
             </table>
         {% else %}
@@ -70,15 +102,15 @@
             <ul class="pager">
                 {% if previous_page %}
                     <li class="previous"><a
-                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/">
+                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
                         <span aria-hidden="true">&larr;</span> 上一页</a></li>
                 {% endif %}
                 {% if next_page %}
                     <li class="next">
-                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/">下一页 <span
-                                aria-hidden="true">&rarr;</span></a></li>
+                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
+                            下一页 <span aria-hidden="true">&rarr;</span></a></li>
                 {% endif %}
             </ul>
         </nav>
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/template/src/oj/problem/problem.html b/template/src/oj/problem/problem.html
index b82fc01a..affc520a 100644
--- a/template/src/oj/problem/problem.html
+++ b/template/src/oj/problem/problem.html
@@ -4,8 +4,14 @@
     <div class="container main">
         <ul class="nav nav-tabs nav-tabs-google">
             <li role="presentation" class="active">
-                <a href="/problem/{{ problem.id }}/">题目</a></li>
-            <li role="presentation"><a href="/problem/{{ problem.id }}/submissions/">我的提交</a></li>
+                <a href="/problem/{{ problem.id }}/">题目</a>
+            </li>
+            <li role="presentation">
+                <a href="/problem/{{ problem.id }}/submissions/">我的提交</a>
+            </li>
+            <li role="presentation">
+                <a href="/problems/">返回</a>
+            </li>
         </ul>
         {% include "oj/problem/_problem_header.html" %}
 
@@ -33,7 +39,6 @@
 
                 </div>
                 <div class="problem-section">
-
                     <label class="problem-label">样例输出{{ forloop.counter }}</label>
         <pre>
 {{ item.output }}</pre>
@@ -45,23 +50,19 @@
             {% if problem.hint %}
                 <div class="problem-section hide">
                     <label class="problem-label">提示</label>
-
                     <p class="problem-detail">{{ problem.hint|safe }}</p>
                 </div>
             {% endif %}
             <div class="problem-section hide">
                 <label class="problem-label">标签</label>
-
                 <p class="problem-detail">
                     {% for tag in problem.tags.all %}
                         <span class="label label-success">{{ tag.name }}</span>
                     {% endfor %}
                 </p>
             </div>
-
             <div>
                 <label>选择语言</label>
-
                 <div>
                     <label class="radio-inline">
                         <input type="radio" name="language" value="1" checked> C (gcc 4.8)
@@ -74,7 +75,6 @@
                     </label>
                 </div>
             </div>
-
             <div id="code-field">
                 <label class="problem-label">提交代码</label>
                 <textarea id="code-editor"></textarea>
@@ -85,9 +85,7 @@
                     提交代码
                 </button>
                 <img src="/static/img/loading.gif" id="loading-gif">
-
             </div>
-
             <div id="result">
             </div>
             <hr>
diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html
index 1f91ce95..08cf17d2 100644
--- a/template/src/oj/submission/my_submissions_list.html
+++ b/template/src/oj/submission/my_submissions_list.html
@@ -8,6 +8,7 @@
             <thead>
             <tr>
                 <th>#</th>
+                <th>题目名称</th>
                 <th>提交时间</th>
                 <th>
                     <div class="dropdown">
@@ -47,8 +48,12 @@
             <tbody>
             {% for item in submissions %}
             <tr>
-                <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
-                    {{ forloop.counter |add:start_id }}</a></th>
+                <th scope="row">
+                    <a href="/submission/{{ item.id }}/">{{ forloop.counter |add:start_id }}</a>
+                </th>
+                <td>
+                    <a href="/problem/{{ item.problem_id }}/">{{ item.problem_id }}</a>
+                </td>
                 <td>{{ item.create_time }}</td>
                 <td>
                     {{ item.language|translate_language }}
@@ -91,4 +96,4 @@
         {% include "oj/announcement/_announcement_panel.html" %}
     </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file