Merge branch 'dev' of git.coding.net:virusdefender/qduoj into dev

update dev
This commit is contained in:
sxw@401
2015-09-10 18:03:08 +08:00
12 changed files with 70 additions and 12 deletions

View File

@@ -402,8 +402,8 @@ def _cmp(x, y):
def contest_rank_page(request, contest_id):
contest = Contest.objects.get(id=contest_id)
contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index")
result = ContestSubmission.objects.filter(contest=contest).values("user_id").annotate(
total_submit=Sum("total_submission_number"))
result = ContestSubmission.objects.filter(contest=contest).values("user_id").\
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)