Accept Merge Request #140 新增提交列表筛选,注销功能,修改样式 : (dev-sxw -> dev)

Merge Request: 新增提交列表筛选,注销功能,修改样式
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/140

account/tests.py

@@ -369,3 +369,18 @@ class AdminRequiredDecoratorTest(TestCase):
         self.client.login(username="test", password="test")
         response = self.client.get("/admin_required_test/cbv/1024/")
         self.assertEqual(response.content, "1024")
+
+
+class UserLogoutTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        user = User.objects.create(username="test")
+        user.admin_type = 1
+        user.set_password("1")
+        user.save()
+
+    def logout_success(self):
+        self.client = Client()
+        self.client.login(username="test", password="1")
+        response = self.client.get("/logout/")
+        self.assertEqual(response.status_code, 302)

account/views.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+from django import http
 from django.contrib import auth
 from django.shortcuts import render
 from django.db.models import Q
@@ -35,6 +36,10 @@ class UserLoginAPIView(APIView):
             return serializer_invalid_response(serializer)
 
 
+def logout(request):
+    auth.logout(request)
+    return http.HttpResponseRedirect("/")
+
 class UserRegisterAPIView(APIView):
     def post(self, request):
         """

contest/views.py

@@ -348,7 +348,7 @@ def contest_list_page(request, page=1):
     # 筛选我能参加的比赛
     join = request.GET.get("join", None)
     if join:
-        contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\
+        contests = contests.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\
             filter(end_time__gt=datetime.datetime.now(), start_time__lt=datetime.datetime.now())
 
     paginator = Paginator(contests, 20)

oj/urls.py

@@ -1,11 +1,11 @@
 # coding=utf-8
 from django.conf.urls import include, url
-from django.contrib import admin
 from django.views.generic import TemplateView
 
 from account.views import (UserLoginAPIView, UsernameCheckAPIView, UserRegisterAPIView,
                            UserChangePasswordAPIView, EmailCheckAPIView,
                            UserAdminAPIView, UserInfoAPIView)
+
 from announcement.views import AnnouncementAdminAPIView
 
 from contest.views import ContestAdminAPIView, ContestProblemAdminAPIView, ContestPasswordVerifyAPIView
@@ -34,6 +34,7 @@ urlpatterns = [
         name="admin_template"),
 
     url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"),
+    url(r'^logout/$', "account.views.logout", name="user_logout_api"),
     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"),

submission/tests.py

@@ -29,6 +29,16 @@ class SubmissionsListPageTest(TestCase):
         response = self.client.get('/submissions/1/')
         self.assertEqual(response.status_code, 200)
 
+    def test_visit_submissionsListPage_successfully_language_filter(self):
+        self.client.login(username="gogoing", password="666666")
+        response = self.client.get('/submissions/?language=1')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_submissionsListPage_successfully_result_filter(self):
+        self.client.login(username="gogoing", password="666666")
+        response = self.client.get('/submissions/?result=1')
+        self.assertEqual(response.status_code, 200)
+
     def test_visit_submissionsListPage_without_page_successfully(self):
         self.client.login(username="gogoing", password="666666")
         response = self.client.get('/submissions/')
@@ -137,10 +147,3 @@ class ContestSubmissionAPITest(APITestCase):
         data = {"language": 1}
         response = self.client.post(self.url, data=data)
         pass
-
-
-
-
-
-
-

submission/views.py

@@ -12,15 +12,14 @@ 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 contest.models import ContestProblem
 
 from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate
 from .models import Submission
 from .serializers import CreateSubmissionSerializer, SubmissionSerializer
-
+from announcement.models import Announcement
 
 class SubmissionAPIView(APIView):
     @login_required
@@ -80,8 +79,10 @@ def problem_my_submissions_list_page(request, problem_id):
         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, 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})
 
@@ -139,6 +140,15 @@ 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")
+    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)
     try:
         current_page = paginator.page(int(page))
@@ -154,6 +164,10 @@ def my_submission_list_page(request, page=1):
     except Exception:
         pass
 
+    # 右侧的公告列表
+    announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
+
     return render(request, "oj/submission/my_submissions_list.html",
                   {"submissions": current_page, "page": int(page),
-                   "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20})
+                   "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
+                   "announcements": announcements, "filter":filter})

template/src/oj/account/login.html

@@ -1,27 +1,33 @@
 {% extends "oj_base.html" %}
 {% block body %}
-    <div class="container main">
-        <div class="col-md-6 col-md-offset-3">
-            <h2 class="text-center">用户登录</h2>
+<div class="container main">
+    <div class="col-md-6 col-md-offset-3">
+        <h2 class="text-center">用户登录</h2>
 
-            <form id="login-form">
-                <div class="form-group">
-                    <label for="username">用户名</label>
-                    <input type="text" class="form-control input-lg" id="username" name="username" maxlength="30" data-error="请填写用户名" placeholder="用户名" autofocus required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <label for="password">密码</label>
-                    <input type="password" class="form-control input-lg" id="password" name="password" maxlength="30" data-error="请填写密码" placeholder="密码" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <button type="submit" class="btn btn-primary">提交</button>
-                </div>
-            </form>
-        </div>
+        <form id="login-form">
+            <div class="form-group">
+                <label for="username">用户名</label>
+                <input type="text" class="form-control input-lg" id="username" name="username" maxlength="30"
+                       data-error="请填写用户名" placeholder="用户名" autofocus required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <label for="password">密码</label>
+                <input type="password" class="form-control input-lg" id="password" name="password" maxlength="30"
+                       data-error="请填写密码" placeholder="密码" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <button type="submit" class="btn btn-primary">提交</button>
+            </div>
+            <a href="/register/">还没有帐号?点击注册</a>
+
+        </form>
     </div>
+</div>
 {% endblock %}
 {% block js_block %}
-    <script src="/static/js/app/oj/account/login.js"></script>
+<script src="/static/js/app/oj/account/login.js"></script>
 {% endblock %}

template/src/oj/announcement/_announcement_panel.html

@@ -5,8 +5,13 @@
             公告
         </h3></div>
     <div class="panel-body">
-        {% for item in announcements %}
-        <p>{{ forloop.counter }}.&nbsp;&nbsp;<a href="/announcement/{{ item.id }}/" target="_blank">{{ item.title }}</a></p>
-        {% endfor %}
+        {% if announcements %}
+            {% for item in announcements %}
+            <p>{{ forloop.counter }}.&nbsp;&nbsp;<a href="/announcement/{{ item.id }}/" target="_blank">{{ item.title }}</a>
+            </p>
+            {% endfor %}
+        {% else %}
+           <p>暂无可显示的公告</p>
+        {% endif %}
     </div>
 </div>

template/src/oj/contest/contest_list.html

@@ -3,7 +3,7 @@
     {% load contest %}
     <div class="container main">
         <div class="row">
-            <div class="col-lg-9">
+            <div class="col-md-9 col-lg-9">
                 <div class="row">
                     <div class="right">
                         <form class="form-inline" method="get">
@@ -15,6 +15,7 @@
                     </div>
                 </div>
                 <div>
+                    {% if contests %}
                     <table class="table table-striped">
                         <thead>
                         <tr>
@@ -47,6 +48,7 @@
                         {% endfor %}
                         </tbody>
                     </table>
+
                     <div class="form-group">
                         <label>仅显示当前可参加的比赛
                             <input id="join" type="checkbox" {% if join %}checked{% endif %} onchange="if(this.checked){location.href='/contests/?join=True'}else{location.href='/contests/'}">
@@ -66,10 +68,13 @@
                             {% endif %}
                         </ul>
                     </nav>
+                    {% else %}
+                        <p>当前没有合适的比赛</p>
+                    {% endif %}
                 </div>
             </div>
 
-            <div class="col-lg-3">
+            <div class="col-md-3 col-lg-3">
                 {% include "oj/announcement/_announcement_panel.html" %}
             </div>
         </div>

template/src/oj/contest/contest_problems_list.html

@@ -26,7 +26,7 @@
         </div>
 
 
-        <div class="col-lg-9">
+        <div class="col-md-9 col-lg-9">
             <div>
                 <table class="table table-striped">
                     <thead>
@@ -55,7 +55,7 @@
 
             </div>
         </div>
-        <div class="col-lg-3">
+        <div class="col-md-3 col-lg-3">
             {% include "oj/announcement/_announcement_panel.html" %}
         </div>
     </div>

template/src/oj/contest/contest_rank.html

@@ -20,6 +20,7 @@
         </div>
         <div class="row">
             <div class="col-lg-12">
+                {% if result %}
                 <table class="table table-bordered">
                     <thead>
                     <tr>
@@ -49,6 +50,9 @@
                     {% endfor %}
                     </tbody>
                 </table>
+                {% else %}
+                    <p>还没有结果</p>
+                {% endif %}
             </div>
         </div>
     </div>

template/src/oj/problem/my_submissions_list.html

@@ -11,6 +11,7 @@
                 <a href="/problem/{{ problem.id }}/submissions/">我的提交</a></li>
         </ul>
         {% include "oj/problem/_problem_header.html" %}
+        {% if submissions %}
         <table class="table table-bordered">
             <thead>
             <tr class="" success>
@@ -42,5 +43,8 @@
 
             </tbody>
         </table>
+        {% else %}
+            <p>你还没有提交该题目</p>
+        {% endif %}
     </div>
 {% endblock %}

template/src/oj/problem/problem_list.html

@@ -3,7 +3,7 @@
     {% load problem %}
     <div class="container main">
         <div class="row">
-            <div class="col-lg-9">
+            <div class="col-md-9 col-lg-9">
                 <div class="row">
                     <div class="right">
                         <form class="form-inline" method="get">
@@ -54,7 +54,7 @@
                 </div>
             </div>
 
-            <div class="col-lg-3">
+            <div class="col-md-3 col-lg-3">
                 {% include "oj/announcement/_announcement_panel.html" %}
                 <div class="panel panel-info">
                     <div class="panel-heading">

template/src/oj/submission/my_submissions_list.html

@@ -2,57 +2,85 @@
 
 {% block body %}
 
-    {% load submission %}
-    <div class="container main">
-        {% if submissions %}
-            <table class="table table-bordered">
-                <thead>
-                <tr class="" success>
-                    <th>#</th>
-                    <th>提交时间</th>
-                    <th>结果</th>
-                    <th>运行时间</th>
-                    <th>语言</th>
-                </tr>
-                </thead>
-                <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 }}">
-                            {{ forloop.counter |add:start_id }}</a></th>
-                        <td>{{ item.create_time }}</td>
-                        <td>{{ item.result|translate_result }}</td>
-                        <td>
-                            {% if item.accepted_answer_time %}
-                                {{ item.accepted_answer_time }}ms
-                            {% else %}
-                                --
-                            {% endif %}
-                        </td>
-                        <td>
-                            {{ item.language|translate_language }}
-                        </td>
-                    </tr>
-                {% endfor %}
+{% load submission %}
+<div class="container main">
+    <div class="col-md-9 col-lg-9">
+        <table class="table table-bordered">
+            <thead>
+            <tr>
+                <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="/submissions/?result=0">Accepted</a></li>
+                        <li><a href="/submissions/?result=6">Wrong Answer</a></li>
+                        <li><a href="/submissions/?result=1">Runtime Error</a></li>
+                        <li><a href="/submissions/?result=2">Time Limit Exceeded</a></li>
+                        <li><a href="/submissions/?result=3">Memory Limit Exceeded</a></li>
+                        <li><a href="/submissions/?result=4">Compile Error</a></li>
+                        <li><a href="/submissions/?result=5">Format Error</a></li>
+                        <li><a href="/submissions/">取消筛选</a></li>
+                    </ul></div>
+                </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="/submissions/?language=1">C</a></li>
+                        <li><a href="/submissions/?language=2">C++</a></li>
+                        <li><a href="/submissions/?language=3">Java</a></li>
+                        <li><a href="/submissions/">取消筛选</a></li>
+                    </ul></div>
+                </th>
+            </tr>
+            </thead>
+            <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 }}">
+                    {{ forloop.counter |add:start_id }}</a></th>
+                <td>{{ item.create_time }}</td>
+                <td>{{ item.result|translate_result }}</td>
+                <td>
+                    {% if item.accepted_answer_time %}
+                    {{ item.accepted_answer_time }}ms
+                    {% else %}
+                    --
+                    {% endif %}
+                </td>
+                <td>
+                    {{ item.language|translate_language }}
+                </td>
+            </tr>
+            {% endfor %}
 
-                </tbody>
-            </table>
-        {% else %}
-            <p>你还没有提交记录!</p>
-        {% endif %}
+            </tbody>
+        </table>
         <nav>
             <ul class="pager">
                 {% if previous_page %}
-                    <li class="previous"><a
-                            href="/submissions/{{ previous_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">
-                        <span aria-hidden="true">&larr;</span> 上一页</a></li>
+                <li class="previous"><a
+                        href="/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="/submissions/{{ next_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">下一页 <span
-                            aria-hidden="true">&rarr;</span></a></li>
+                <li class="next"><a
+                        href="/submissions/{{ next_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">下一页 <span
+                        aria-hidden="true">&rarr;</span></a></li>
                 {% endif %}
             </ul>
         </nav>
+        {% if not submissions %}
+        <p>你还没有提交记录!</p>
+        {% endif %}
     </div>
+    <div class="col-md-3 col-lg-3">
+        {% include "oj/announcement/_announcement_panel.html" %}
+    </div>
+</div>
 {% endblock %}

template/src/oj_base.html

@@ -48,28 +48,28 @@
                 <li><a href="/about/">关于</a></li>
             </ul>
             {% if request.user.is_authenticated %}
-                <ul class="nav navbar-nav navbar-right">
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                           aria-expanded="false">
-                            李扬
-                            <span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="#">我的提交</a></li>
-                            <li><a href="#">我的资料</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#">退出</a></li>
-                        </ul>
-                    </li>
-                </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                       aria-expanded="false">
+                        {{ request.user.username }}
+                        <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/submission/">我的提交</a></li>
+                        <li><a href="#">我的资料</a></li>
+                        <li role="separator" class="divider"></li>
+                        <li><a href="/logout/">退出</a></li>
+                    </ul>
+                </li>
+            </ul>
             {% else %}
-                <ul class="nav navbar-nav navbar-right">
-                    <li class="dropdown">
-                        <a href="/login/" class="dropdown-toggle">
-                            登录
-                        </a>
-                    </li>
-                </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li>
+                    <a href="/login/">
+                        登录
+                    </a>
+                </li>
+            </ul>
             {% endif %}
         </div>
     </div>
@@ -84,6 +84,10 @@
 <script src="/static/js/require.js"></script>
 <script>
     require(["bootstrap"]);
+
+
+
+
 </script>
 {% block js_block %}{% endblock %}
 <!-- footer begin -->