mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
使用新的生成比赛排名的方式
This commit is contained in:
parent
aa0f27fc47
commit
8cd2bdbaf0
@ -141,7 +141,7 @@ class ContestRank(models.Model):
|
|||||||
info["ac_time"] = (submission.create_time - self.contest.start_time).total_seconds()
|
info["ac_time"] = (submission.create_time - self.contest.start_time).total_seconds()
|
||||||
|
|
||||||
# 之前已经提交过,但是是错误的,这次提交是正确的。错误的题目不计入罚时
|
# 之前已经提交过,但是是错误的,这次提交是正确的。错误的题目不计入罚时
|
||||||
self.total_time += (info["ac_time"] + info["error_time"] * 20 * 60)
|
self.total_time += (info["ac_time"] + info["error_number"] * 20 * 60)
|
||||||
problem = ContestProblem.objects.get(id=submission.problem_id)
|
problem = ContestProblem.objects.get(id=submission.problem_id)
|
||||||
if problem.total_accepted_number == 0:
|
if problem.total_accepted_number == 0:
|
||||||
info["is_first_ac"] = True
|
info["is_first_ac"] = True
|
||||||
|
@ -16,7 +16,8 @@ from utils.shortcuts import (serializer_invalid_response, error_response,
|
|||||||
from account.models import SUPER_ADMIN, User
|
from account.models import SUPER_ADMIN, User
|
||||||
from account.decorators import login_required
|
from account.decorators import login_required
|
||||||
from group.models import Group
|
from group.models import Group
|
||||||
from .models import Contest, ContestProblem, ContestSubmission, CONTEST_ENDED, CONTEST_NOT_START, CONTEST_UNDERWAY
|
from .models import (Contest, ContestProblem, ContestSubmission, CONTEST_ENDED,
|
||||||
|
CONTEST_NOT_START, CONTEST_UNDERWAY, ContestRank)
|
||||||
from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST
|
from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST
|
||||||
from .decorators import check_user_contest_permission
|
from .decorators import check_user_contest_permission
|
||||||
from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer,
|
from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer,
|
||||||
@ -379,81 +380,16 @@ def contest_list_page(request, page=1):
|
|||||||
"keyword": keyword, "join": join})
|
"keyword": keyword, "join": join})
|
||||||
|
|
||||||
|
|
||||||
def _cmp(x, y):
|
|
||||||
if x["total_ac"] > y["total_ac"]:
|
|
||||||
return 1
|
|
||||||
elif x["total_ac"] < y["total_ac"]:
|
|
||||||
return -1
|
|
||||||
else:
|
|
||||||
if x["total_time"] < y["total_time"]:
|
|
||||||
return 1
|
|
||||||
else:
|
|
||||||
return -1
|
|
||||||
|
|
||||||
|
|
||||||
def get_the_formatted_time(seconds):
|
|
||||||
if not seconds:
|
|
||||||
return ""
|
|
||||||
result = str(seconds % 60)
|
|
||||||
if seconds % 60 < 10:
|
|
||||||
result = "0" + result
|
|
||||||
result = str((seconds % 3600) / 60) + ":" + result
|
|
||||||
if (seconds % 3600) / 60 < 10:
|
|
||||||
result = "0" + result
|
|
||||||
result = str(seconds / 3600) + ":" + result
|
|
||||||
if seconds / 3600 < 10:
|
|
||||||
result = "0" + result
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
@check_user_contest_permission
|
@check_user_contest_permission
|
||||||
def contest_rank_page(request, contest_id):
|
def contest_rank_page(request, contest_id):
|
||||||
contest = Contest.objects.get(id=contest_id)
|
contest = Contest.objects.get(id=contest_id)
|
||||||
contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index")
|
contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index")
|
||||||
r = redis.Redis(host=REDIS_CACHE["host"], port=REDIS_CACHE["port"], db=REDIS_CACHE["db"])
|
rank = ContestRank.objects.filter(contest_id=contest_id).order_by("-total_ac_number", "total_time")
|
||||||
if contest.real_time_rank:
|
return render(request, "oj/contest/contest_rank_new.html",
|
||||||
# 更新rank
|
{"rank": rank, "contest": contest,
|
||||||
result = ContestSubmission.objects.filter(contest=contest).values("user_id"). \
|
"contest_problems": contest_problems,
|
||||||
annotate(total_submit=Sum("total_submission_number"))
|
|
||||||
for i in range(0, len(result)):
|
|
||||||
# 这个人所有的提交
|
|
||||||
submissions = ContestSubmission.objects.filter(user_id=result[i]["user_id"], contest_id=contest_id)
|
|
||||||
result[i]["submissions"] = {}
|
|
||||||
result[i]["problems"] = []
|
|
||||||
for problem in contest_problems:
|
|
||||||
try:
|
|
||||||
status = submissions.get(problem=problem)
|
|
||||||
result[i]["problems"].append({
|
|
||||||
"first_achieved": status.first_achieved,
|
|
||||||
"ac": status.ac,
|
|
||||||
"failed_number": status.total_submission_number,
|
|
||||||
"ac_time": get_the_formatted_time(status.ac_time)})
|
|
||||||
if status.ac:
|
|
||||||
result[i]["problems"][-1]["failed_number"] -= 1
|
|
||||||
except ContestSubmission.DoesNotExist:
|
|
||||||
result[i]["problems"].append({})
|
|
||||||
result[i]["total_ac"] = submissions.filter(ac=True).count()
|
|
||||||
user= User.objects.get(id=result[i]["user_id"])
|
|
||||||
result[i]["username"] = user.username
|
|
||||||
result[i]["real_name"] = user.real_name
|
|
||||||
result[i]["total_time"] = get_the_formatted_time(submissions.filter(ac=True).aggregate(total_time=Sum("total_time"))["total_time"])
|
|
||||||
|
|
||||||
result = sorted(result, cmp=_cmp, reverse=True)
|
|
||||||
r.set("contest_rank_" + contest_id, json.dumps(list(result)))
|
|
||||||
else:
|
|
||||||
# 从缓存读取排名信息
|
|
||||||
result = r.get("contest_rank_" + contest_id)
|
|
||||||
if result:
|
|
||||||
result = json.loads(result)
|
|
||||||
else:
|
|
||||||
result = []
|
|
||||||
|
|
||||||
return render(request, "oj/contest/contest_rank.html",
|
|
||||||
{"contest": contest, "contest_problems": contest_problems,
|
|
||||||
"result": result,
|
|
||||||
"auto_refresh": request.GET.get("auto_refresh", None) == "true",
|
"auto_refresh": request.GET.get("auto_refresh", None) == "true",
|
||||||
"show_real_name": request.GET.get("show_real_name", None) == "true",
|
"show_real_name": request.GET.get("show_real_name", None) == "true",})
|
||||||
"real_time_rank": contest.real_time_rank})
|
|
||||||
|
|
||||||
|
|
||||||
class ContestTimeAPIView(APIView):
|
class ContestTimeAPIView(APIView):
|
||||||
@ -468,5 +404,4 @@ class ContestTimeAPIView(APIView):
|
|||||||
return error_response(u"比赛不存在")
|
return error_response(u"比赛不存在")
|
||||||
return success_response({"start": int((contest.start_time - now()).total_seconds() * 1000),
|
return success_response({"start": int((contest.start_time - now()).total_seconds() * 1000),
|
||||||
"end": int((contest.end_time - now()).total_seconds() * 1000),
|
"end": int((contest.end_time - now()).total_seconds() * 1000),
|
||||||
"status": contest.status})
|
"status": contest.status})
|
||||||
|
|
@ -3,6 +3,7 @@
|
|||||||
比赛排名
|
比赛排名
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
{% load contest %}
|
||||||
<div class="container main">
|
<div class="container main">
|
||||||
|
|
||||||
<ul class="nav nav-tabs nav-tabs-google contest-tab">
|
<ul class="nav nav-tabs nav-tabs-google contest-tab">
|
||||||
@ -23,13 +24,13 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<h2 class="text-center">排名(
|
<h2 class="text-center">排名(
|
||||||
{% if real_time_rank %}
|
{% if contest.real_time_rank %}
|
||||||
实时
|
实时
|
||||||
{% else %}
|
{% else %}
|
||||||
已封榜
|
已封榜
|
||||||
{% endif %})
|
{% endif %})
|
||||||
</h2>
|
</h2>
|
||||||
{% if result %}
|
{% if rank %}
|
||||||
<table class="table table-bordered text-center">
|
<table class="table table-bordered text-center">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -45,24 +46,20 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="rank">
|
<tbody class="rank">
|
||||||
{% for item in result %}
|
{% for item in rank %}
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">{{ forloop.counter }}</th>
|
<th scope="row">{{ forloop.counter }}</th>
|
||||||
<td>
|
<td>
|
||||||
{{ item.username }}
|
{{ item.user.username }}
|
||||||
{% if show_real_name %}
|
{% if show_real_name %}
|
||||||
({{ item.real_name }})
|
({{ item.real_name }})
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>{{ item.total_ac }} / {{ item.total_submit }}</td>
|
<td>{{ item.total_ac_number }} / {{ item.total_submission_number }}</td>
|
||||||
<td>{% if item.total_time %}{{ item.total_time }}{% else %}--{% endif %}</td>
|
<td>{% if item.total_time %}{{ item.total_time|format_seconds }}{% else %}--{% endif %}</td>
|
||||||
{% for problem in item.problems %}
|
{% for problem in contest_problems %}
|
||||||
<td class="
|
<td class="{% get_submission_class item problem %}">
|
||||||
{% if problem %}{% if problem.ac %}{% if problem.first_achieved %}first-achieved{% else %}alert-success{% endif %}{% else %}alert-danger{% endif %}{% endif %}">
|
{% get_submission_content item problem %}
|
||||||
{% if problem.ac %}{{ problem.ac_time }}{% endif %}
|
|
||||||
{% if problem.failed_number %}
|
|
||||||
(-{{ problem.failed_number }})
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
</td>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -14,4 +14,8 @@ class RichTextField(models.TextField):
|
|||||||
parser = XssHtml()
|
parser = XssHtml()
|
||||||
parser.feed(value)
|
parser.feed(value)
|
||||||
parser.close()
|
parser.close()
|
||||||
return parser.getHtml()
|
return parser.getHtml()
|
||||||
|
|
||||||
|
|
||||||
|
class JsonField(models.TextField):
|
||||||
|
pass
|
@ -100,5 +100,5 @@ def paginate(request, query_set, object_serializer):
|
|||||||
|
|
||||||
|
|
||||||
def rand_str(length=32):
|
def rand_str(length=32):
|
||||||
string = hashlib.md5(str(time.time()) + str(random.randrange(1, 9999999900))).hexdigest()
|
string = hashlib.md5(str(time.time()) + str(random.randrange(1, 987654321234567))).hexdigest()
|
||||||
return string[0:length]
|
return string[0:length]
|
@ -23,9 +23,50 @@ def get_contest_status_color(contest):
|
|||||||
return "success"
|
return "success"
|
||||||
|
|
||||||
|
|
||||||
|
def get_the_formatted_time(seconds):
|
||||||
|
if not seconds:
|
||||||
|
return ""
|
||||||
|
seconds = int(seconds)
|
||||||
|
hour = seconds / (60 * 60)
|
||||||
|
minute = (seconds - hour * 60 * 60) / 60
|
||||||
|
second = seconds - hour * 60 * 60 - minute * 60
|
||||||
|
return str(hour) + ":" + str(minute) + ":" + str(second)
|
||||||
|
|
||||||
|
|
||||||
|
def get_submission_class(rank, problem):
|
||||||
|
if str(problem.id) not in rank.submission_info:
|
||||||
|
return ""
|
||||||
|
else:
|
||||||
|
submission = rank.submission_info[str(problem.id)]
|
||||||
|
if submission["is_ac"]:
|
||||||
|
_class = "alert-success"
|
||||||
|
if submission["is_first_ac"]:
|
||||||
|
_class += " first-achieved"
|
||||||
|
else:
|
||||||
|
_class = "alert-danger"
|
||||||
|
return _class
|
||||||
|
|
||||||
|
|
||||||
|
def get_submission_content(rank, problem):
|
||||||
|
if str(problem.id) not in rank.submission_info:
|
||||||
|
return ""
|
||||||
|
else:
|
||||||
|
submission = rank.submission_info[str(problem.id)]
|
||||||
|
if submission["is_ac"]:
|
||||||
|
r = get_the_formatted_time(submission["ac_time"])
|
||||||
|
if submission["error_number"]:
|
||||||
|
r += "(-" + str(submission["error_number"]) + ")"
|
||||||
|
return r
|
||||||
|
else:
|
||||||
|
return "(-" + str(submission["error_number"]) + ")"
|
||||||
|
|
||||||
|
|
||||||
from django import template
|
from django import template
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
register.filter("contest_status", get_contest_status)
|
register.filter("contest_status", get_contest_status)
|
||||||
register.filter("contest_status_color", get_contest_status_color)
|
register.filter("contest_status_color", get_contest_status_color)
|
||||||
|
register.filter("format_seconds", get_the_formatted_time)
|
||||||
|
register.simple_tag(get_submission_class, name="get_submission_class")
|
||||||
|
register.simple_tag(get_submission_content, name="get_submission_content")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user