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

Registrace: Úprava zacházení se stavy (invited -> active, present zrušen)

parent 3a745f96
No related branches found
No related tags found
1 merge request!86Registrace
...@@ -106,7 +106,7 @@ class Score: ...@@ -106,7 +106,7 @@ class Score:
def __init__( def __init__(
self, round: db.Round, contest: Optional[db.Contest] = None, self, round: db.Round, contest: Optional[db.Contest] = None,
# Ze kterých stavů chceme výsledkovku počítat # Ze kterých stavů chceme výsledkovku počítat
part_states: List[db.PartState] = [db.PartState.registered, db.PartState.invited, db.PartState.present], part_states: List[db.PartState] = [db.PartState.registered, db.PartState.active],
): ):
self.round = round self.round = round
self.contest = contest self.contest = contest
......
...@@ -107,7 +107,7 @@ def find_or_create_participation(user: db.User, contest: db.Contest, place: Opti ...@@ -107,7 +107,7 @@ def find_or_create_participation(user: db.User, contest: db.Contest, place: Opti
is_new = pions == [] is_new = pions == []
if is_new: if is_new:
pion = db.Participation(user=user, contest=contest, place_id=place.place_id, state=db.PartState.invited) pion = db.Participation(user=user, contest=contest, place_id=place.place_id, state=db.PartState.active)
sess.add(pion) sess.add(pion)
logger.info(f'{reason.title()}: Založena účast user=#{user.user_id} contest=#{contest.contest_id} place=#{place.place_id}') logger.info(f'{reason.title()}: Založena účast user=#{user.user_id} contest=#{contest.contest_id} place=#{place.place_id}')
mo.util.log( mo.util.log(
......
...@@ -1497,7 +1497,7 @@ def org_contest_advance(contest_id: int): ...@@ -1497,7 +1497,7 @@ def org_contest_advance(contest_id: int):
prev_pion_query = (sess.query(db.Participation) prev_pion_query = (sess.query(db.Participation)
.filter(db.Participation.contest_id.in_([c.contest_id for c in prev_contests])) .filter(db.Participation.contest_id.in_([c.contest_id for c in prev_contests]))
.filter(db.Participation.state.in_((db.PartState.registered, db.PartState.invited, db.PartState.present)))) .filter_by(state=db.PartState.active))
prev_pions = prev_pion_query.all() prev_pions = prev_pion_query.all()
if form.boundary.data > 0: if form.boundary.data > 0:
...@@ -1540,7 +1540,7 @@ def org_contest_advance(contest_id: int): ...@@ -1540,7 +1540,7 @@ def org_contest_advance(contest_id: int):
user_id=pp.user_id, user_id=pp.user_id,
contest_id=contest.contest_id, contest_id=contest.contest_id,
place_id=contest.place.place_id, place_id=contest.place.place_id,
state=db.PartState.invited, state=db.PartState.active,
) )
.on_conflict_do_nothing() .on_conflict_do_nothing()
.returning(db.Participation.contest_id) .returning(db.Participation.contest_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment