diff --git a/mo/web/org_score.py b/mo/web/org_score.py index e1162a798ecd89032b2f62093063944a7e4c88b9..78f8d90957d4ac1922d968fc1cc6ffdda973cac1 100644 --- a/mo/web/org_score.py +++ b/mo/web/org_score.py @@ -117,8 +117,7 @@ def org_score(round_id: Optional[int] = None, contest_id: Optional[int] = None): columns = [] columns.append(Column(key='order', name='poradi', title='Pořadí')) if is_export: - columns.append(Column(key='winner', name='vitez')) - columns.append(Column(key='successful', name='uspesny_resitel')) + columns.append(Column(key='status', name='stav')) columns.append(Column(key='participant', name='ucastnik', title='Účastník')) if is_export: columns.append(Column(key='email', name='email')) @@ -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 school = pant.school_place 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={ 'order': OrderCell(result.order.place, result.order.span, result.order.continuation), - 'winner': 'ano' if result.winner else '', - 'successful': 'ano' if result.successful else '', + 'status': status, 'user': user, 'email': user.email, 'participant': cell_pion_link(user, local_pion_ct_id, user.full_name()),