Skip to content
Snippets Groups Projects
Commit 4776a5fd authored by Martin Mareš's avatar Martin Mareš
Browse files

org_score: Exportujeme sloupeček se stavem vítěz/úspěšný/ostatní

Přijde mi to výrazně praktičtější než samostatné booleovské sloupečky.
parent a5088569
No related branches found
No related tags found
No related merge requests found
...@@ -117,8 +117,7 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None): ...@@ -117,8 +117,7 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None):
columns = [] columns = []
columns.append(Column(key='order', name='poradi', title='Pořadí')) columns.append(Column(key='order', name='poradi', title='Pořadí'))
if is_export: if is_export:
columns.append(Column(key='winner', name='vitez')) columns.append(Column(key='status', name='stav'))
columns.append(Column(key='successful', name='uspesny_resitel'))
columns.append(Column(key='participant', name='ucastnik', title='Účastník')) columns.append(Column(key='participant', name='ucastnik', title='Účastník'))
if is_export: if is_export:
columns.append(Column(key='email', name='email')) columns.append(Column(key='email', name='email'))
...@@ -152,10 +151,17 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None): ...@@ -152,10 +151,17 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None):
user, pant, pion = result.user, result.pant, result.pion user, pant, pion = result.user, result.pant, result.pion
school = pant.school_place school = pant.school_place
local_pion_ct_id = subcontest_id_map[(round.round_id, pion.contest_id)] local_pion_ct_id = subcontest_id_map[(round.round_id, pion.contest_id)]
if result.winner:
status = 'vítěz'
elif result.successful:
status = 'úspěšný'
else:
status = ""
row = Row(keys={ row = Row(keys={
'order': OrderCell(result.order.place, result.order.span, result.order.continuation), 'order': OrderCell(result.order.place, result.order.span, result.order.continuation),
'winner': 'ano' if result.winner else '', 'status': status,
'successful': 'ano' if result.successful else '',
'user': user, 'user': user,
'email': user.email, 'email': user.email,
'participant': cell_pion_link(user, local_pion_ct_id, user.full_name()), 'participant': cell_pion_link(user, local_pion_ct_id, user.full_name()),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment