将dev-hohoTT中的修改更改到hohoTT-dev，用于合并dev

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)
-

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:

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>
+                    <td class="alert-{{ item.result|translate_result_class }}">
-                        {{ item.language|translate_language }}
+                        <strong>{{ item.result|translate_result }}</strong>
                     </td>
                 </tr>
             {% endfor %}

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>
+                        <td class="alert-{{ item.result|translate_result_class }}">
-                            {{ item.language|translate_language }}
+                            <strong>{{ item.result|translate_result }}</strong>
                         </td>
                     </tr>
                 {% endfor %}
-
                 </tbody>
             </table>
         {% else %}
@@ -70,13 +102,13 @@
             <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
+                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
-                                aria-hidden="true">&rarr;</span></a></li>
+                            下一页 <span aria-hidden="true">&rarr;</span></a></li>
                 {% endif %}
             </ul>
         </nav>

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>
+                <a href="/problem/{{ problem.id }}/">题目</a>
-            <li role="presentation"><a href="/problem/{{ problem.id }}/submissions/">我的提交</a></li>
+            </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>

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 }}">
+                <th scope="row">
-                    {{ forloop.counter |add:start_id }}</a></th>
+                    <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 }}