From 6250718c12b0fa064429590ccc4f4a9740fd5c18 Mon Sep 17 00:00:00 2001
From: Jiri Kalvoda <jirikalvoda@kam.mff.cuni.cz>
Date: Tue, 21 Sep 2021 20:10:14 +0200
Subject: [PATCH] =?UTF-8?q?ParticipantsFilterForm=20nepou=C5=BEivat=20f=5F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mo/web/org_contest.py | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py
index 37e380b0..34d55e0e 100644
--- a/mo/web/org_contest.py
+++ b/mo/web/org_contest.py
@@ -59,26 +59,6 @@ class ParticipantsFilterForm(PagerForm):
     download_csv = wtforms.SubmitField("↓ CSV")
     download_tsv = wtforms.SubmitField("↓ TSV")
 
-    # Výstupní hodnoty filtru, None při nepoužitém filtru, prázdná db hodnota při
-    # nepovedené filtraci (neexistující místo a podobně)
-    f_school: Optional[db.Place] = None
-    f_participation_place: Optional[db.Place] = None
-    f_contest_place: Optional[db.Place] = None
-    f_participation_state: Optional[db.PartState] = None
-
-    def validate_school(self, field):
-        self.f_school = field.place
-
-    def validate_participation_place(self, field):
-        self.f_participation_place = field.place
-
-    def validate_contest_place(self, field):
-        self.f_contest_place = field.place
-
-    def validate_participation_state(self, field):
-        self.f_participation_state = None if field.data == '*' else field.data
-
-
 class ParticipantsActionForm(FlaskForm):
     action_on = wtforms.RadioField(
         "Provést akci na", validators=[validators.DataRequired()],
@@ -441,12 +421,15 @@ def org_contest_list(id: int, site_id: Optional[int] = None):
     filter = ParticipantsFilterForm(formdata=request.args)
     if request.args:
         filter.validate()
+    f_participation_state = filter.participation_place.data
+    if not f_participation_place:
+        f_participation_place = "*"
     query = get_contestants_query(
         round=master_contest.round, contest=master_contest, site=site,
-        school=filter.f_school,
+        school=filter.school.place,
         # contest_place=filter.f_contest_place,
-        participation_place=filter.f_participation_place,
-        participation_state=filter.f_participation_state,
+        participation_place=filter.participation_place.data,
+        participation_state=f_participation_state
     )
 
     action_form = None
-- 
GitLab