From a5088569041750b48f447fa4b530e6819925016c Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 8 Mar 2021 16:13:35 +0100
Subject: [PATCH] =?UTF-8?q?org=5Fscore:=20Typov=C3=A1n=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/org_score.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mo/web/org_score.py b/mo/web/org_score.py
index 190e5e44..e1162a79 100644
--- a/mo/web/org_score.py
+++ b/mo/web/org_score.py
@@ -41,7 +41,7 @@ class SolPointsCell(Cell):
user: db.User
sol: Optional[db.Solution]
- def __init__(self, contest_id: int, user: db.User, sol: db.Solution):
+ def __init__(self, contest_id: int, user: db.User, sol: Optional[db.Solution]):
self.contest_id = contest_id
self.user = user
self.sol = sol
@@ -159,14 +159,15 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None):
'user': user,
'email': user.email,
'participant': cell_pion_link(user, local_pion_ct_id, user.full_name()),
- 'contest': CellLink(pion.contest.place.name, url_for('org_contest', id=pion.contest_id)),
+ 'contest': CellLink(pion.contest.place.name or "?", url_for('org_contest', id=pion.contest_id)),
'pion_place': pion.place.name,
- 'school': CellLink(school.name, url_for('org_place', id=school.place_id)),
+ 'school': CellLink(school.name or "?", url_for('org_place', id=school.place_id)),
'grade': pant.grade,
'total_points': result.get_total_points(),
'birth_year': pant.birth_year,
'order_key': result._order_key,
})
+
sols = result.get_sols_map()
for task in tasks:
local_sol_ct_id = subcontest_id_map[(task.round_id, pion.contest_id)]
@@ -180,7 +181,7 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None):
table_rows.append(row)
filename = f"vysledky_{round.year}-{round.category}-{round.level}"
- if contest_id:
+ if contest:
filename += f"_oblast_{contest.place.code or contest.place.place_id}"
table = Table(
table_class="data full center",
--
GitLab