mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
[后端-前台]添加了submissions分页显示(只显示当前用户的提交),调用已有的view完成单个submission的显示.显示界面与问题分页显示统一.问题是id的显示.url:http://127.0.0.1:8000/my_submissions/
This commit is contained in:
parent
919b648695
commit
75eb1192fb
@ -59,5 +59,7 @@ urlpatterns = [
|
|||||||
name="join_group_request_admin_api"),
|
name="join_group_request_admin_api"),
|
||||||
url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"),
|
url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"),
|
||||||
url(r'^api/admin/submission/$', SubmissionAdminAPIView.as_view(), name="submission_admin_api_view"),
|
url(r'^api/admin/submission/$', SubmissionAdminAPIView.as_view(), name="submission_admin_api_view"),
|
||||||
|
url(r'^my_submissions/$', "submission.views.my_submission_list_page", name="my_submission_list_page"),
|
||||||
|
url(r'^my_submissions/(?P<page>\d+)/$', "submission.views.my_submission_list_page", name="my_submission_list_page"),
|
||||||
|
|
||||||
]
|
]
|
||||||
|
@ -13,6 +13,7 @@ from problem.models import Problem
|
|||||||
from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate
|
from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate
|
||||||
from .models import Submission
|
from .models import Submission
|
||||||
from .serializers import CreateSubmissionSerializer, SubmissionSerializer
|
from .serializers import CreateSubmissionSerializer, SubmissionSerializer
|
||||||
|
from django.core.paginator import Paginator
|
||||||
|
|
||||||
|
|
||||||
class SubmissionAPIView(APIView):
|
class SubmissionAPIView(APIView):
|
||||||
@ -101,4 +102,33 @@ class SubmissionAdminAPIView(APIView):
|
|||||||
if not problem_id:
|
if not problem_id:
|
||||||
return error_response(u"参数错误")
|
return error_response(u"参数错误")
|
||||||
submissions = Submission.objects.filter(problem_id=problem_id).order_by("-create_time")
|
submissions = Submission.objects.filter(problem_id=problem_id).order_by("-create_time")
|
||||||
return paginate(request, submissions, SubmissionSerializer)
|
return paginate(request, submissions, SubmissionSerializer)
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
def my_submission_list_page(request, page = 1):
|
||||||
|
try:
|
||||||
|
submissions = Submission.objects.filter(user_id=request.user.id)
|
||||||
|
except Submission.DoesNotExist:
|
||||||
|
return error_page(request, u"你还没有提交过任何问题")
|
||||||
|
paginator = Paginator(submissions, 20)
|
||||||
|
try:
|
||||||
|
current_page = paginator.page(int(page))
|
||||||
|
except Exception:
|
||||||
|
return error_page(request, u"不存在的页码")
|
||||||
|
previous_page = next_page = None
|
||||||
|
try:
|
||||||
|
previous_page = current_page.previous_page_number()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
next_page = current_page.next_page_number()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return render(request, "oj/submission/my_submissions_list.html",
|
||||||
|
{"submissions": current_page, "page": int(page),
|
||||||
|
"previous_page": previous_page, "next_page": next_page})
|
||||||
|
|
||||||
|
|
||||||
|
return render(request, "oj/submission/my_submissions_list.html", {"submissions": submission})
|
||||||
|
60
template/oj/submission/my_submissions_list.html
Normal file
60
template/oj/submission/my_submissions_list.html
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
{% extends 'oj_base.html' %}
|
||||||
|
|
||||||
|
{% 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>
|
||||||
|
|
||||||
|
<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 }}/">{{ item.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>
|
||||||
|
<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">←</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">→</span></a></li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
Loading…
Reference in New Issue
Block a user