From 093ec3fc799fcdd010f6482d32402b4f888108ab Mon Sep 17 00:00:00 2001 From: esp Date: Sat, 22 Aug 2015 13:45:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=8E=E7=AB=AF]=E5=89=8D=E5=8F=B0=E6=88=91?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E9=A1=B5=E9=9D=A2=20=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E6=8F=90=E4=BA=A4=E5=BA=8F=E5=8F=B7=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA,=E5=8E=9F=E6=9D=A5=E6=98=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9C=9F=E5=AE=9Eid=E5=8D=B3=E9=9A=8F=E6=9C=BA=E7=9A=84?= =?UTF-8?q?=E6=95=A3=E5=88=97=E5=80=BC,=E4=B8=8D=E5=A5=BD=E7=9C=8B,?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=94=B9=E6=88=90=E8=87=AA=E7=84=B6=E6=95=B0?= =?UTF-8?q?=E5=BA=8F=E5=88=97,=E4=BD=86=E9=9C=80=E8=A6=81=E7=BB=93?= =?UTF-8?q?=E5=90=88javascript=E7=94=9F=E6=88=90,=E4=B8=94=E6=98=AF?= =?UTF-8?q?=E7=9B=B8=E5=AF=B9=E5=80=BC,=E5=9B=A0=E4=B8=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=87=8C=E6=B2=A1=E6=9C=89=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5,=E6=9C=89=E7=82=B9=E5=88=AB=E6=89=AD?= =?UTF-8?q?=E4=BA=86.=20=20=20=E7=AC=AC=E4=BA=8C,=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E5=8F=8D=E9=A6=88.=20=20=20?= =?UTF-8?q?=E7=AC=AC=E4=B8=89,=E6=9C=AC=E6=89=93=E7=AE=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD,=E4=BD=86?= =?UTF-8?q?=E5=9B=A0=E4=B8=BAURL=E9=9A=BE=E4=BB=A5=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=9C=E7=BD=A2,=E5=8F=AA=E6=9C=89=E5=9C=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84url=E6=89=8D=E8=83=BD=E8=BE=83?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E5=A4=84=E7=90=86,=E4=B8=8B=E6=AC=A1?= =?UTF-8?q?=E5=86=8D=E8=AF=B4=E6=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submission/views.py | 11 ++++++----- template/oj/submission/my_submissions_list.html | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/submission/views.py b/submission/views.py index fed235a..39aa5b8 100644 --- a/submission/views.py +++ b/submission/views.py @@ -85,7 +85,7 @@ 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).order_by("-create_time").\ + submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).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}) @@ -117,7 +117,6 @@ def my_submission(request, submission_id): {"submission": submission, "problem": problem, "info": info}) - class SubmissionAdminAPIView(APIView): def get(self, request): problem_id = request.GET.get("problem_id", None) @@ -126,11 +125,13 @@ class SubmissionAdminAPIView(APIView): submissions = Submission.objects.filter(problem_id=problem_id).order_by("-create_time") return paginate(request, submissions, SubmissionSerializer) + @login_required -def my_submission_list_page(request, page = 1): +def my_submission_list_page(request, page=1): if not page: - page = 1 - submissions = Submission.objects.filter(user_id=request.user.id) + page = 1 + submissions = Submission.objects.filter(user_id=request.user.id). \ + values("id", "result", "create_time", "accepted_answer_time", "language") paginator = Paginator(submissions, 20) try: current_page = paginator.page(int(page)) diff --git a/template/oj/submission/my_submissions_list.html b/template/oj/submission/my_submissions_list.html index e13d978..259f176 100644 --- a/template/oj/submission/my_submissions_list.html +++ b/template/oj/submission/my_submissions_list.html @@ -10,7 +10,9 @@ +
+ {% if submissions %} @@ -24,7 +26,8 @@ {% for item in submissions %} - +
{{ item.id }}{{ forloop.counter + }} {{ item.create_time }} {{ item.result|translate_result }} @@ -42,6 +45,9 @@
+ {% else %} +

你还没有提交记录!

+ {% endif %} + {% endblock %}