From 4847a3a36c0042d3bab7deeaa277c107dc02869c Mon Sep 17 00:00:00 2001 From: esp Date: Fri, 28 Aug 2015 17:56:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=E6=B7=BB=E5=8A=A0=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=88=97=E8=A1=A8=E7=9A=84=E5=85=AC=E5=91=8A=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submission/views.py | 13 ++- .../oj/submission/my_submissions_list.html | 89 ++++++++++--------- 2 files changed, 56 insertions(+), 46 deletions(-) diff --git a/submission/views.py b/submission/views.py index 17c16157..12c4ec4e 100644 --- a/submission/views.py +++ b/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}) @@ -154,6 +155,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}) \ No newline at end of file + "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, + "announcements": announcements}) \ No newline at end of file diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html index 279bee67..2f28bd84 100644 --- a/template/src/oj/submission/my_submissions_list.html +++ b/template/src/oj/submission/my_submissions_list.html @@ -2,57 +2,62 @@ {% block body %} - {% load submission %} -
+{% load submission %} +
+
{% if submissions %} - - - - - - - - - - - - {% for item in submissions %} - - - - - - - - {% endfor %} +
#提交时间结果运行时间语言
- {{ forloop.counter |add:start_id }}{{ item.create_time }}{{ item.result|translate_result }} - {% if item.accepted_answer_time %} - {{ item.accepted_answer_time }}ms - {% else %} - -- - {% endif %} - - {{ item.language|translate_language }} -
+ + + + + + + + + + + {% for item in submissions %} + + + + + + + + {% endfor %} - -
#提交时间结果运行时间语言
+ {{ forloop.counter |add:start_id }}{{ item.create_time }}{{ item.result|translate_result }} + {% if item.accepted_answer_time %} + {{ item.accepted_answer_time }}ms + {% else %} + -- + {% endif %} + + {{ item.language|translate_language }} +
- {% else %} -

你还没有提交记录!

- {% endif %} + + + {% else %} +

你还没有提交记录!

+ {% endif %}
+
+ {% include "oj/announcement/_announcement_panel.html" %} +
+
{% endblock %}