mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
31356da9d1
* dev: (21 commits) [前端]整理格式,去掉tab(以前用vim,它自己给加的),去掉调试用的console.log[CI SKIP] [前端]统一admin中js命名方式. 为提交列表添加返回按钮[CI SKIP] [前端]修复bug,更正了不恰当的foreach循环,(js里for(var key in array)不仅遍历了数组元素,还将遍历数组其他的属性以及成员方法),修复了显示编辑区函数对选中小组错误的清除方法.(原来的做法将导致某些情况下旧的小组无法移除编辑区域. 增添了切换编辑比赛的提示,防止用户丢失为保存的信息. 添加问题列表对可见比赛的筛选[CI SKIP] [前端-BUG]修复比赛编辑区可见状态显示错误,(忘记加vm.),增加编辑成功隐藏编辑框的行为,更加方便[CI SKIP] [前端]添加比赛题目列表可见字段的显示,方便比赛管理[CI SKIP] [BUG-fix]返回按钮提示确认,修复不能弹出的问题[CI SKIP] 修复typo in submission/views.py Swagger UI docs中的拼写错误[CI SKIP] [前端]修复userList.js中关于翻页按钮状态控制函数参数的错误. 修复刚刚提交的bug[CI SKIP] [前端]修复userList页面avalon重定义问题[CI SKIP] [前端]修复问题管理(后台)页面的avalon重复定义的问题[CI SKIP] [前端]整理js格式. 修复小bugs,关于比赛密码修改变量名称的错误,小组修改变量名称错误(以上都是在修改比赛页面内)[CI SKIP] [后台]修复contestAdmin,比赛和问题API的逻辑问题,主要针对超级管理员和普通管理员的差别.写了测试,是两个api测试覆盖率达100% [migration]改model漏了一个.....[CI SKIP] [前端-后台]比赛管理,对添加,编辑,列表页面的avalon使用方法做了统一的改变,防止出现页内模板改变但页面不刷新的情况下导致avalon功能间歇性异常的问题,但是代码量变大了一些,还算是整洁.具体是所有页面的avalon只在页面第一次加载的时候初始化,再次加载时只对vm内部变量重新初始化,而不调用avalon.define了[CI SKIP] [后端]添加修改比赛题目添加对题目分数的支持 [后端]为比赛problem model添加分数(score)字段,用于记分模式的比赛 [后端]修复typo,工作正常,没写测试还 [前端]修改比赛列表页面,添加了编辑比赛,编辑比赛题目[CI SKIP] [前端]把添加比赛和添加比赛问题分开了,就是把添加问题模块从添加比赛页面删除了 [前端]添加了后台比赛列表对问题的添加修改页面[CI SKIP] ... Conflicts: static/src/js/app/admin/problem/editProblem.js static/src/js/app/admin/problem/submissionList.js submission/views.py
159 lines
5.9 KiB
Python
159 lines
5.9 KiB
Python
# coding=utf-8
|
|
import json
|
|
|
|
import redis
|
|
from django.shortcuts import render
|
|
from django.core.paginator import Paginator
|
|
|
|
from rest_framework.views import APIView
|
|
|
|
from judge.judger_controller.tasks import judge
|
|
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 utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate
|
|
from .models import Submission
|
|
from .serializers import CreateSubmissionSerializer, SubmissionSerializer
|
|
|
|
|
|
class SubmissionAPIView(APIView):
|
|
@login_required
|
|
def post(self, request):
|
|
"""
|
|
提交代码
|
|
---
|
|
request_serializer: CreateSubmissionSerializer
|
|
"""
|
|
serializer = CreateSubmissionSerializer(data=request.data)
|
|
if serializer.is_valid():
|
|
data = serializer.data
|
|
try:
|
|
problem = Problem.objects.get(id=data["problem_id"])
|
|
# 更新问题的总提交计数
|
|
problem.total_submit_number += 1
|
|
problem.save()
|
|
except Problem.DoesNotExist:
|
|
return error_response(u"题目不存在")
|
|
submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]),
|
|
code=data["code"], problem_id=problem.id)
|
|
|
|
try:
|
|
judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
|
|
except Exception:
|
|
return error_response(u"提交判题任务失败")
|
|
|
|
# 增加redis 中判题队列长度的计数器
|
|
r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
|
|
r.incr("judge_queue_length")
|
|
|
|
return success_response({"submission_id": submission.id})
|
|
else:
|
|
return serializer_invalid_response(serializer)
|
|
|
|
@login_required
|
|
def get(self, request):
|
|
submission_id = request.GET.get("submission_id", None)
|
|
if not submission_id:
|
|
return error_response(u"参数错误")
|
|
try:
|
|
submission = Submission.objects.get(id=submission_id, user_id=request.user.id)
|
|
except Submission.DoesNotExist:
|
|
return error_response(u"提交不存在")
|
|
response_data = {"result": submission.result}
|
|
if submission.result == 0:
|
|
response_data["accepted_answer_time"] = submission.accepted_answer_time
|
|
return success_response(response_data)
|
|
|
|
|
|
@login_required
|
|
def problem_my_submissions_list_page(request, problem_id):
|
|
"""
|
|
我单个题目所有提交的列表页
|
|
"""
|
|
try:
|
|
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})
|
|
|
|
|
|
@login_required
|
|
def my_submission(request, submission_id):
|
|
"""
|
|
单个题目的提交详情页
|
|
"""
|
|
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)
|
|
except Submission.DoesNotExist:
|
|
return error_page(request, u"提交不存在")
|
|
|
|
if submission.contest_id:
|
|
try:
|
|
problem = ContestProblem.objects.get(id=submission.problem_id,
|
|
visible=True)
|
|
except ContestProblem.DoesNotExist:
|
|
return error_page(request, u"提交不存在")
|
|
else:
|
|
try:
|
|
problem = Problem.objects.get(id=submission.problem_id, visible=True)
|
|
except Problem.DoesNotExist:
|
|
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",
|
|
{"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)
|
|
|
|
|
|
@login_required
|
|
def my_submission_list_page(request, page=1):
|
|
"""
|
|
我的所有提交的列表页
|
|
"""
|
|
submissions = Submission.objects.filter(user_id=request.user.id). \
|
|
values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
|
|
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, "start_id": int(page) * 20 - 20}) |