From 0faf1d381ebc843b2f1c50bcd1b95a147a7f6b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Domes?= Date: Thu, 23 May 2019 23:54:30 +0200 Subject: [PATCH] =?UTF-8?q?testutil.py:=20odsazen=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/testutils.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/seminar/testutils.py b/seminar/testutils.py index a8cd7052..3bb21e30 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -116,7 +116,10 @@ def gen_organizatori(rnd, osoby, last_rocnik, users): return organizatori def gen_ulohy_do_cisla(rnd, cislo, organizatori, resitele, slovnik_cisel, size): - '''cislo = cislo cisla v rocniku, nikoli objekt Cislo ''' + ''' + cislo = cislo cisla v rocniku, nikoli objekt Cislo + ''' + # ulohy resene v ci jaka = ["Šachová", "Černá", "Větrná", "Dlouhá", "Křehká", "Rychlá", "Zákeřná", "Fyzikální"] @@ -152,8 +155,13 @@ def gen_ulohy_do_cisla(rnd, cislo, organizatori, resitele, slovnik_cisel, size): cislo_reseni=slovnik_cisel[cislo], cislo_deadline=slovnik_cisel[cislo], max_body = rnd.randint(1, 8)) - p.zadani = " ".join([rnd.choice(sloveso), rnd.choice(koho), - rnd.choice(ceho), rnd.choice(jmeno), rnd.choice(kde)]) + p.zadani = " ".join( + [rnd.choice(sloveso), + rnd.choice(koho), + rnd.choice(ceho), + rnd.choice(jmeno), + rnd.choice(kde)] + ) p.vzorak = " - ".join([p.zadani, rnd.choice(reseni)]) p.save() @@ -164,11 +172,17 @@ def gen_ulohy_do_cisla(rnd, cislo, organizatori, resitele, slovnik_cisel, size): # (nebo skoro vsechny resitele, pokud jich je mene nez pocet reseni) res_vyber = rnd.sample(resitele, min(poc_reseni, len(resitele) - 2)) for resitel in res_vyber: - res = Reseni.objects.create(problem = p, - resitele=[resitel], - forma=rnd.choice(Reseni.FORMA_CHOICES)) - hod = Hodnoceni.objects.create(body=rnd.randint(0, p.max_body), - cislo_body=slovnik_cisel[cislo], reseni=res, problem=p) + res = Reseni.objects.create( + problem = p, + resitele=[resitel], + forma=rnd.choice(Reseni.FORMA_CHOICES) + ) + hod = Hodnoceni.objects.create( + body=rnd.randint(0, p.max_body), + cislo_body=slovnik_cisel[cislo], + reseni=res, + problem=p + ) return def gen_soustredeni():