Tabulky submitů (celková i úlohová) upraveny pro dělená kola

Issue #178

mo/web/org_contest.py

@@ -944,7 +944,7 @@ def org_contest_task(contest_id: int, task_id: int, site_id: Optional[int] = Non
 
     sess = db.get_session()
 
-    q = get_solutions_query(sc.task, for_contest=sc.contest, for_site=sc.site)
+    q = get_solutions_query(sc.task, for_contest=sc.master_contest, for_site=sc.site)
     rows: List[Tuple[db.Participation, db.Solution]] = q.all()
     rows.sort(key=lambda r: r[0].user.sort_key())
 
@@ -1050,13 +1050,13 @@ def org_contest_solutions(id: int, site_id: Optional[int] = None):
     if edit_action and not sc.allow_create_solutions:
         raise werkzeug.exceptions.Forbidden()
 
-    pions_subq = sess.query(db.Participation.user_id).filter_by(contest=sc.contest)
+    pions_subq = sess.query(db.Participation.user_id).filter_by(contest=sc.master_contest)
     if sc.site:
         pions_subq = pions_subq.filter_by(place=sc.site)
     pions_subq = pions_subq.subquery()
     pions = (sess.query(db.Participation)
              .filter(
-                 db.Participation.contest == sc.contest,
+                 db.Participation.contest == sc.master_contest,
                  db.Participation.user_id.in_(pions_subq),
              ).options(joinedload(db.Participation.user))
              .all())

mo/web/templates/org_contest_solutions.html

@@ -61,7 +61,7 @@ konkrétní úlohu. Symbol <span class="icon">🗐</span> značí, že existuje
 	{% for pion in pions %}
 	{% set u = pion.user %}
 	<tr class="state-{{ pion.state.name }}{% if u.is_test %} testuser{% endif %}" {% if u.is_test %}title="Testovací uživatel"{% endif %}>
-		<th>{{ u|pion_link(pion.contest_id) }}
+		<th>{{ u|pion_link(contest.contest_id) }}
 		<td>{{ pion.state.friendly_name() }}
 		{% set sum_points = [] %}
 		{% for task in tasks %}

mo/web/templates/parts/org_solution_table.html

@@ -41,7 +41,7 @@ finální (ve výchozím stavu poslední nahrané).{% elif sc.allow_upload_solut
 		<td>{% if for_user %}
 			<a href='{{ url_for('org_contest_task', contest_id=ct_id, task_id=task.task_id) }}'>{{ task.code }} {{ task.name }}</a>
 		    {% else %}
-			{{ u|pion_link(obj.contest_id) }}</a>
+			{{ u|pion_link(contest.contest_id) }}</a>
 		    {% endif %}
 		{% if for_task %}<td>{{ obj.state.friendly_name() }}{% endif %}
 		{% if sol %}