Skip to content
Snippets Groups Projects
Commit 3fb128fd authored by Martin Mareš's avatar Martin Mareš
Browse files

Merge branch 'honza/fix2' into 'master'

Oprava seznamu účastníků soutěžního místa

See merge request !35
parents 7eca6090 f063f26d
No related branches found
No related tags found
1 merge request!35Oprava seznamu účastníků soutěžního místa
...@@ -422,7 +422,7 @@ def org_contest_list(id: int, site_id: Optional[int] = None): ...@@ -422,7 +422,7 @@ def org_contest_list(id: int, site_id: Optional[int] = None):
filter = ParticipantsFilterForm(request.args) filter = ParticipantsFilterForm(request.args)
filter.validate() filter.validate()
query = get_contestants_query( query = get_contestants_query(
round=contest.round, contest=contest, round=contest.round, contest=contest, site=site,
school=filter.f_school, school=filter.f_school,
# contest_place=filter.f_contest_place, # contest_place=filter.f_contest_place,
participation_place=filter.f_participation_place, participation_place=filter.f_participation_place,
...@@ -467,6 +467,7 @@ contest_list_columns = ( ...@@ -467,6 +467,7 @@ contest_list_columns = (
def get_contestants_query( def get_contestants_query(
round: db.Round, contest: Optional[db.Contest] = None, round: db.Round, contest: Optional[db.Contest] = None,
site: Optional[db.Place] = None,
contest_place: Optional[db.Place] = None, contest_place: Optional[db.Place] = None,
participation_place: Optional[db.Place] = None, participation_place: Optional[db.Place] = None,
participation_state: Optional[db.PartState] = None, participation_state: Optional[db.PartState] = None,
...@@ -483,6 +484,8 @@ def get_contestants_query( ...@@ -483,6 +484,8 @@ def get_contestants_query(
query = query.filter(db.Contest.round == round) query = query.filter(db.Contest.round == round)
query = query.options(joinedload(db.Contest.place)) query = query.options(joinedload(db.Contest.place))
query = query.filter(db.Participation.contest_id == db.Contest.contest_id) query = query.filter(db.Participation.contest_id == db.Contest.contest_id)
if site:
query = query.filter(db.Participation.place_id == site.place_id)
if contest_place: if contest_place:
query = query.filter(db.Contest.place_id == contest_place.place_id) query = query.filter(db.Contest.place_id == contest_place.place_id)
if participation_place: if participation_place:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment