mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
Accept Merge Request #116 修改导航栏的 url;修复我的提交顺序顺序问题 : (virusdefender-dev -> dev)
Merge Request: 修改导航栏的 url;修复我的提交顺序顺序问题 Created By: @virusdefender Accepted By: @virusdefender URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/116
This commit is contained in:
commit
f250dec201
@ -117,7 +117,7 @@ class SubmissionAdminAPIView(APIView):
|
|||||||
@login_required
|
@login_required
|
||||||
def my_submission_list_page(request, page=1):
|
def my_submission_list_page(request, page=1):
|
||||||
submissions = Submission.objects.filter(user_id=request.user.id). \
|
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)
|
paginator = Paginator(submissions, 20)
|
||||||
try:
|
try:
|
||||||
current_page = paginator.page(int(page))
|
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",
|
return render(request, "oj/submission/my_submissions_list.html",
|
||||||
{"submissions": current_page, "page": int(page),
|
{"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})
|
||||||
|
@ -2,65 +2,57 @@
|
|||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
|
||||||
{% load submission %}
|
{% load submission %}
|
||||||
<div class="container main">
|
<div class="container main">
|
||||||
<ul class="nav nav-tabs nav-tabs-google">
|
{% if submissions %}
|
||||||
<li role="presentation">
|
<table class="table table-bordered">
|
||||||
<a href="/submission/">提交</a></li>
|
<thead>
|
||||||
<li role="presentation" class="active">
|
<tr class="" success>
|
||||||
<a href="/submission/my_submissions/">我的提交</a></li>
|
<th>#</th>
|
||||||
</ul>
|
<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>
|
</tbody>
|
||||||
{% if submissions %}
|
</table>
|
||||||
<table class="table table-bordered">
|
{% else %}
|
||||||
<thead>
|
<p>你还没有提交记录!</p>
|
||||||
<tr class="" success>
|
{% endif %}
|
||||||
<th>#</th>
|
<nav>
|
||||||
<th>提交时间</th>
|
<ul class="pager">
|
||||||
<th>结果</th>
|
{% if previous_page %}
|
||||||
<th>运行时间</th>
|
<li class="previous"><a
|
||||||
<th>语言</th>
|
href="/my_submissions/{{ previous_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">
|
||||||
</tr>
|
<span aria-hidden="true">←</span> 上一页</a></li>
|
||||||
</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 %}
|
|
||||||
--
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
{% if next_page %}
|
||||||
<td>
|
<li class="next"><a
|
||||||
{{ item.language|translate_language }}
|
href="/my_submissions/{{ next_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}{% if tag %}?tag={{ tag }}{% endif %}">下一页 <span
|
||||||
</td>
|
aria-hidden="true">→</span></a></li>
|
||||||
</tr>
|
{% endif %}
|
||||||
{% endfor %}
|
</ul>
|
||||||
|
</nav>
|
||||||
</tbody>
|
</div>
|
||||||
</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">←</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 %}
|
{% endblock %}
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
<div id="navbar" class="navbar-collapse collapse">
|
<div id="navbar" class="navbar-collapse collapse">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li><a href="/problems/">题目</a></li>
|
<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="/contests/">比赛</a></li>
|
||||||
<li><a href="/about/">关于</a></li>
|
<li><a href="/about/">关于</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
Loading…
Reference in New Issue
Block a user