mam/mamweb
11
0
Fork 0
Code Issues Pull requests 8 Projects Wiki Activity Actions

Oddělení sousových věcí #56

Merged
zelvuska merged 15 commits from split_sous into master 2024-10-22 22:15:15 +02:00
Conversation 1 Commits 15 Files changed 5 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ccf3ec07f7 - Show all commits

2
seminar/testutils.py
View file

@ -842,7 +842,7 @@ def create_test_data(size = 6, rnd = None):
soustredeni = gen_soustredeni(size, resitele, organizatori, rnd=rnd)
#generování konfer
konfery = gen_konfery(size, organizatori, resitele, soustredeni, rnd=rnd)
konfery = gen_konfery(size, organizatori, soustredeni, rnd=rnd)
# vytvoreni pdf ke korekturam
create_test_pdf(rnd, organizatori)

4
soustredeni/testutils.py
View file

@ -43,8 +43,8 @@ def gen_soustredeni(
def gen_konfery(
size: int,
organizatori: Sequence[pm.Organizator],
resitele: Sequence[pm.Resitel],
soustredeni: Sequence[Soustredeni],
resitele: Sequence[pm.Resitel] = None,
rnd: random.Random = None,
) -> Sequence[Konfera]:
logger.info('Generuji konfery (size={})...'.format(size))
@ -61,7 +61,7 @@ def gen_konfery(
garant=rnd.choice(organizatori),
soustredeni=rnd.choice(soustredeni),
typ_prezentace=rnd.choice(['veletrh', 'prezentace']))
ucastnici_sous = list(konfera.soustredeni.ucastnici.all())
ucastnici_sous = resitele if resitele else list(konfera.soustredeni.ucastnici.all())
ucastnici = rnd.sample(ucastnici_sous, min(len(ucastnici_sous), rnd.randint(3, 6)))
konfera.ucastnici.set(ucastnici)
konfera.save()