From cbd9e448c51890b2307100507eaf141121a2746e Mon Sep 17 00:00:00 2001 From: "sxw@401" Date: Sat, 5 Sep 2015 19:55:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=88=97=E8=A1=A8=E4=B8=AD=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9A=84=E6=A0=87=E8=AF=86?= =?UTF-8?q?(AC/=E6=AD=A3=E5=9C=A8=E8=BF=9B=E8=A1=8C/=E6=B2=A1=E5=BC=80?= =?UTF-8?q?=E5=A7=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/views.py | 32 ++++++++++++------- .../src/oj/contest/contest_problems_list.html | 17 +++++++++- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/contest/views.py b/contest/views.py index a117672..ca93b67 100644 --- a/contest/views.py +++ b/contest/views.py @@ -323,11 +323,24 @@ def contest_problems_list_page(request, contest_id): 比赛所有题目的列表页 """ try: - contest_problems = ContestProblem.objects.filter(contest=Contest.objects.get(id=contest_id)).order_by("sort_index") + contest = Contest.objects.get(id=contest_id) except Contest.DoesNotExist: - return error_page(request, u"比赛题目不存在") + return error_page(request, u"比赛不存在") + + contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index") + submissions = ContestSubmission.objects.filter(user=request.user, contest=contest) + state = {} + for item in submissions: + state[item.problem_id] = item.ac + for item in contest_problems: + if item.id in state: + item.ac = state[item.id].ac + else: + item.ac = 0 + # 右侧的公告列表 announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time") + return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems, "announcements": announcements, "contest": {"id": contest_id}}) @@ -348,7 +361,7 @@ def contest_list_page(request, page=1): # 筛选我能参加的比赛 join = request.GET.get("join", None) if join: - contests = contests.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\ + contests = contests.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())). \ filter(end_time__gt=datetime.datetime.now(), start_time__lt=datetime.datetime.now()) paginator = Paginator(contests, 20) @@ -379,7 +392,6 @@ def contest_list_page(request, page=1): "join": join}) - def _cmp(x, y): if x["total_ac"] > y["total_ac"]: return 1 @@ -396,7 +408,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) @@ -407,11 +420,6 @@ def contest_rank_page(request, contest_id): result[i]["user"] = User.objects.get(id=result[i]["user_id"]) result[i]["total_time"] = submissions.filter(ac=True).aggregate(total_time=Sum("total_time"))["total_time"] - return render(request, "oj/contest/contest_rank.html", - {"contest": contest, "contest_problems": contest_problems, "result": sorted(result, cmp=_cmp, reverse=True)}) - - - - - + {"contest": contest, "contest_problems": contest_problems, + "result": sorted(result, cmp=_cmp, reverse=True)}) diff --git a/template/src/oj/contest/contest_problems_list.html b/template/src/oj/contest/contest_problems_list.html index 0289592..aae2a2b 100644 --- a/template/src/oj/contest/contest_problems_list.html +++ b/template/src/oj/contest/contest_problems_list.html @@ -40,7 +40,22 @@ {% for item in contest_problems %} - + + + + + {{ item.sort_index }}