mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
优化前台提交页面的显示
This commit is contained in:
parent
ce5b0804b9
commit
ba958eddc2
@ -1,6 +1,8 @@
|
|||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from account.models import User
|
||||||
|
from .models import Submission
|
||||||
|
|
||||||
|
|
||||||
class CreateSubmissionSerializer(serializers.Serializer):
|
class CreateSubmissionSerializer(serializers.Serializer):
|
||||||
@ -8,3 +10,13 @@ class CreateSubmissionSerializer(serializers.Serializer):
|
|||||||
language = serializers.IntegerField()
|
language = serializers.IntegerField()
|
||||||
code = serializers.CharField(max_length=3000)
|
code = serializers.CharField(max_length=3000)
|
||||||
|
|
||||||
|
|
||||||
|
class SubmissionSerializer(serializers.ModelSerializer):
|
||||||
|
user = serializers.SerializerMethodField("_get_submission_user")
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = Submission
|
||||||
|
fields = ["id", "result", "create_time", "language", "user"]
|
||||||
|
|
||||||
|
def _get_submission_user(self, obj):
|
||||||
|
return User.objects.get(id=obj.user_id).username
|
@ -8,10 +8,11 @@ from rest_framework.views import APIView
|
|||||||
from judge.judger.result import result
|
from judge.judger.result import result
|
||||||
from judge.judger_controller.tasks import judge
|
from judge.judger_controller.tasks import judge
|
||||||
from account.decorators import login_required
|
from account.decorators import login_required
|
||||||
|
from account.models import SUPER_ADMIN
|
||||||
from problem.models import Problem
|
from problem.models import Problem
|
||||||
from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page
|
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
|
from .serializers import CreateSubmissionSerializer, SubmissionSerializer
|
||||||
|
|
||||||
|
|
||||||
class SubmissionAPIView(APIView):
|
class SubmissionAPIView(APIView):
|
||||||
@ -70,12 +71,34 @@ def problem_my_submissions_list_page(request, problem_id):
|
|||||||
@login_required
|
@login_required
|
||||||
def my_submission(request, submission_id):
|
def my_submission(request, submission_id):
|
||||||
try:
|
try:
|
||||||
|
# 超级管理员可以查看所有的提交
|
||||||
|
if request.user.admin_type != SUPER_ADMIN:
|
||||||
|
submission = Submission.objects.get(id=submission_id, user_id=request.user.id)
|
||||||
|
else:
|
||||||
submission = Submission.objects.get(id=submission_id)
|
submission = Submission.objects.get(id=submission_id)
|
||||||
except Submission.DoesNotExist:
|
except Submission.DoesNotExist:
|
||||||
return error_page(request, u"提交不存在")
|
return error_page(request, u"提交不存在")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
problem = Problem.objects.get(id=submission.problem_id, visible=True)
|
problem = Problem.objects.get(id=submission.problem_id, visible=True)
|
||||||
except Problem.DoesNotExist:
|
except Problem.DoesNotExist:
|
||||||
return error_page(request, u"提交不存在")
|
return error_page(request, u"提交不存在")
|
||||||
|
if submission.info:
|
||||||
|
try:
|
||||||
|
info = json.loads(submission.info)
|
||||||
|
except Exception:
|
||||||
|
info = submission.info
|
||||||
|
else:
|
||||||
|
info = None
|
||||||
return render(request, "oj/problem/my_submission.html",
|
return render(request, "oj/problem/my_submission.html",
|
||||||
{"submission": submission, "problem": problem})
|
{"submission": submission, "problem": problem, "info": info})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class SubmissionAdminAPIView(APIView):
|
||||||
|
def get(self, request):
|
||||||
|
problem_id = request.GET.get("problem_id", None)
|
||||||
|
if not problem_id:
|
||||||
|
return error_response(u"参数错误")
|
||||||
|
submissions = Submission.objects.filter(problem_id=problem_id).order_by("-create_time")
|
||||||
|
return paginate(request, submissions, SubmissionSerializer)
|
@ -1,4 +1,10 @@
|
|||||||
<div ms-controller="groupDetail" class="col-md-9">
|
<div ms-controller="groupDetail" class="col-md-9">
|
||||||
|
<nav>
|
||||||
|
<ul class="pager">
|
||||||
|
<li class="previous" ms-click="showGroupListPage()"><a href="javascript:void(0)"><span
|
||||||
|
aria-hidden="true">←</span> 返回</a></li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
<h1>小组成员管理</h1>
|
<h1>小组成员管理</h1>
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -1,5 +1,11 @@
|
|||||||
<div ms-controller="editProblem" class="col-md-9">
|
<div ms-controller="editProblem" class="col-md-9">
|
||||||
<form id="edit-problem-form">
|
<form id="edit-problem-form">
|
||||||
|
<nav>
|
||||||
|
<ul class="pager">
|
||||||
|
<li class="previous" ms-click="showProblemListPage()"><a href="javascript:void(0)"><span
|
||||||
|
aria-hidden="true">←</span> 返回</a></li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
|
||||||
<div class="form-group col-md-12">
|
<div class="form-group col-md-12">
|
||||||
<label>题目标题</label>
|
<label>题目标题</label>
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
<td>{{ el.total_accepted_number }}/{{ el.total_submit_number }}</td>
|
<td>{{ el.total_accepted_number }}/{{ el.total_submit_number }}</td>
|
||||||
<td>
|
<td>
|
||||||
<button class="btn-sm btn-info" ms-click="showEditProblemPage(el.id)">编辑</button>
|
<button class="btn-sm btn-info" ms-click="showEditProblemPage(el.id)">编辑</button>
|
||||||
|
<button class="btn-sm btn-info" ms-click="showProblemSubmissionPage(el.id)">提交</button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
28
template/admin/problem/submission_list.html
Normal file
28
template/admin/problem/submission_list.html
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<div ms-controller="submissionList" class="col-md-9">
|
||||||
|
<h1>提交列表</h1>
|
||||||
|
|
||||||
|
<table class="table table-striped">
|
||||||
|
<tr>
|
||||||
|
<th>ID</th>
|
||||||
|
<th>创建时间</th>
|
||||||
|
<th>作者</th>
|
||||||
|
<td>结果</td>
|
||||||
|
<td></td>
|
||||||
|
</tr>
|
||||||
|
<tr ms-repeat="submissionList">
|
||||||
|
<td>{{ el.id }}</td>
|
||||||
|
<td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
|
||||||
|
<td>{{ el.user }}</td>
|
||||||
|
<td>{{ results[el.result] }}</td>
|
||||||
|
<td>
|
||||||
|
<a class="btn btn-info" ms-attr-href="'/my_submission/' + el.id + '/'" target="_blank">详情</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<div class="text-right">
|
||||||
|
页数:{{ page }}/{{ totalPage }}
|
||||||
|
<button ms-attr-class="getBtnClass('pre')" ms-click="getPrevious">上一页</button>
|
||||||
|
<button ms-attr-class="getBtnClass('next')" ms-click="getNext">下一页</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<script src="/static/js/app/admin/problem/submission_list.js"></script>
|
@ -32,6 +32,17 @@
|
|||||||
<p>提交时间 : {{ submission.create_time }}</p>
|
<p>提交时间 : {{ submission.create_time }}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% ifequal request.user.admin_type 2 %}
|
||||||
|
<p>本调试信息仅超级管理员可见</p>
|
||||||
|
{% ifequal submission.result 7 %}
|
||||||
|
<pre>System Error: {{ submission.info }}</pre>
|
||||||
|
{% else %}
|
||||||
|
<pre>{{ info }}</pre>
|
||||||
|
{% endifequal %}
|
||||||
|
|
||||||
|
{% endifequal %}
|
||||||
|
|
||||||
|
|
||||||
<div id="code-field">
|
<div id="code-field">
|
||||||
<textarea id="code-editor">{{ submission.code }}</textarea>
|
<textarea id="code-editor">{{ submission.code }}</textarea>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user