Generování protokolů a zpracování scanů

mo/jobs/protocols.py

@@ -62,10 +62,9 @@ def tex_arg(s: str) -> str:
 
 
 def _get_user_id_query(contest: db.Contest, site_id: Optional[int]) -> Query:
-    q = db.get_session().query(db.Participation.user_id).filter_by(contest=contest)
+    q = db.get_session().query(db.Participation.user_id).filter_by(contest=contest, state=db.PartState.active)
     if site_id is not None:
         q = q.filter_by(place_id=site_id)
-    q = q.filter(db.Participation.state.in_((db.PartState.invited, db.PartState.registered, db.PartState.present)))
     return q
 
 
@@ -74,6 +73,7 @@ def _get_pants(contest: db.Contest, site_id: Optional[int]) -> List[db.Participa
 
     pants = (db.get_session().query(db.Participant)
              .options(joinedload(db.Participant.user), joinedload(db.Participant.school_place))
+             .filter_by(year=config.CURRENT_YEAR)
              .filter(db.Participant.user_id.in_(user_id_subq))
              .all())
     pants.sort(key=lambda p: p.user.sort_key())