Vylepšení výsledkové listiny

Potřeboval jsem vygenerovat výsledkovku pro krajské kolo kategorie P. Jednak jsem dodělal různé drobnosti do mo.score a okolí, jednak napsal skript, který pomocí mo.score vygeneruje TeXovou a webovou verzi výsledkovky.

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
@@ -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,21 +151,35 @@ 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)]
+
+        order_cell: Union[Cell, str]
+        if result.successful or not score.want_successful:
+            order_cell = OrderCell(result.order.place, result.order.span, result.order.continuation)
+        else:
+            order_cell = ""
+
+        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 '',
+            'order':        order_cell,
+            'status':       status,
             '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 +193,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",