From 44f9ea862c322bb2a100fde5f1bb7423dc7076eb Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sat, 22 Aug 2015 21:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E7=9A=84=20url=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A1=BA=E5=BA=8F=E9=A1=BA=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 submission/views.py                           |   4 +-
 .../oj/submission/my_submissions_list.html    | 110 ++++++++----------
 template/oj_base.html                         |   2 +-
 3 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/submission/views.py b/submission/views.py
index 792660a8..ab8fb712 100644
--- a/submission/views.py
+++ b/submission/views.py
@@ -117,7 +117,7 @@ class SubmissionAdminAPIView(APIView):
 @login_required
 def my_submission_list_page(request, page=1):
     submissions = Submission.objects.filter(user_id=request.user.id). \
-        values("id", "result", "create_time", "accepted_answer_time", "language")
+        values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
     paginator = Paginator(submissions, 20)
     try:
         current_page = paginator.page(int(page))
@@ -135,4 +135,4 @@ def my_submission_list_page(request, page=1):
 
     return render(request, "oj/submission/my_submissions_list.html",
                   {"submissions": current_page, "page": int(page),
-                   "previous_page": previous_page, "next_page": next_page, "startId":int(page)*20-20})
+                   "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20})
diff --git a/template/oj/submission/my_submissions_list.html b/template/oj/submission/my_submissions_list.html
index c6fcacb0..4b939ece 100644
--- a/template/oj/submission/my_submissions_list.html
+++ b/template/oj/submission/my_submissions_list.html
@@ -2,65 +2,57 @@
 
 {% block body %}
 
-{% load submission %}
-<div class="container main">
-    <ul class="nav nav-tabs nav-tabs-google">
-        <li role="presentation">
-            <a href="/submission/">提交</a></li>
-        <li role="presentation" class="active">
-            <a href="/submission/my_submissions/">我的提交</a></li>
-    </ul>
+    {% 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 %}
 
-    <br>
-    {% 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:startId  }}</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 %}
-                --
+                </tbody>
+            </table>
+        {% else %}
+            <p>你还没有提交记录!</p>
+        {% endif %}
+        <nav>
+            <ul class="pager">
+                {% if previous_page %}
+                    <li class="previous"><a
+                            href="/my_submissions/{{ previous_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">
+                        <span aria-hidden="true">&larr;</span> 上一页</a></li>
                 {% endif %}
-            </td>
-            <td>
-                {{ item.language|translate_language }}
-            </td>
-        </tr>
-        {% endfor %}
-
-        </tbody>
-    </table>
-    {% else %}
-    <p>你还没有提交记录!</p>
-    {% endif %}
-    <nav>
-        <ul class="pager">
-            {% if previous_page %}
-            <li class="previous"><a
-                    href="/my_submissions/{{ previous_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">
-                <span aria-hidden="true">&larr;</span> 上一页</a></li>
-            {% endif %}
-            {% if next_page %}
-            <li class="next"><a
-                    href="/my_submissions/{{ next_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">下一页 <span
-                    aria-hidden="true">&rarr;</span></a></li>
-            {% endif %}
-        </ul>
-    </nav>
-</div>
+                {% if next_page %}
+                    <li class="next"><a
+                            href="/my_submissions/{{ next_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">下一页 <span
+                            aria-hidden="true">&rarr;</span></a></li>
+                {% endif %}
+            </ul>
+        </nav>
+    </div>
 {% endblock %}
diff --git a/template/oj_base.html b/template/oj_base.html
index 082cad5b..61b887ab 100644
--- a/template/oj_base.html
+++ b/template/oj_base.html
@@ -43,7 +43,7 @@
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
                 <li><a href="/problems/">题目</a></li>
-                <li><a href="/submissions/">提交</a></li>
+                <li><a href="/my_submissions/">提交</a></li>
                 <li><a href="/contests/">比赛</a></li>
                 <li><a href="/about/">关于</a></li>
             </ul>