Správné počítání odevzdaných řešení u soutěže

Započítáváme jen solution od Participations tohoto contestu.

Také odstraněno již nepotřebné count.

Fix #70

mo/web/org_contest.py

@@ -224,16 +224,18 @@ def org_contest(id: int, site_id: Optional[int] = None):
     sess = db.get_session()
     contest, site, rr = get_contest_site_rr(id, site_id, None)
 
+    tasks_subq = sess.query(db.Task.task_id).filter_by(round=contest.round)
+    pions_subq = sess.query(db.Participation.user_id).filter_by(contest=contest)
+    if site:
+        pions_subq = pions_subq.filter_by(place=site)
     sol_counts_q = (
         sess.query(db.Solution.task_id, func.count(db.Solution.task_id))
-        .filter(db.Solution.task_id.in_(
-            sess.query(db.Task.task_id).filter_by(round=contest.round)
-        ))
+        .filter(
+            db.Solution.task_id.in_(tasks_subq),
+            db.Solution.user_id.in_(pions_subq),
         )
-    if site:
-        sol_counts_q = sol_counts_q.filter(db.Solution.user_id.in_(
-            sess.query(db.Participation.user_id).filter_by(place=site)
-        ))
+    )
+
     sol_counts = {}
     for task_id, count in sol_counts_q.group_by(db.Solution.task_id).all():
         sol_counts[task_id] = count
@@ -243,12 +245,8 @@ def org_contest(id: int, site_id: Optional[int] = None):
     for task in tasks:
         task.sol_count = sol_counts[task.task_id] if task.task_id in sol_counts else 0
 
-
-    count = None
     places_counts = None
-    if site_id:
-        count = sess.query(db.Participation).filter_by(place_id=site_id).count()
-    else:
+    if not site_id:
         places_counts = (
             sess.query(db.Place, func.count('*'))
             .select_from(db.Participation).join(db.Place)
@@ -261,7 +259,7 @@ def org_contest(id: int, site_id: Optional[int] = None):
         contest=contest, site=site,
         rights=sorted(rr.current_rights, key=lambda r: r. name),
         can_manage=rr.have_right(Right.manage_contest),
-        tasks=tasks, places_counts=places_counts, count=count,
+        tasks=tasks, places_counts=places_counts,
     )