|
|
|
@ -13,7 +13,7 @@ import unidecode |
|
|
|
import logging |
|
|
|
|
|
|
|
from korektury.testutils import create_test_pdf |
|
|
|
from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky, TreeNode |
|
|
|
from seminar.models import Skola, Resitel, Rocnik, Cislo, Deadline, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky, TreeNode |
|
|
|
import seminar.models as m |
|
|
|
|
|
|
|
from django.contrib.flatpages.models import FlatPage |
|
|
|
@ -299,7 +299,7 @@ def gen_reseni_ulohy(rnd, cisla, uloha, pocet_resitelu, poradi_cisla, resitele_c |
|
|
|
# Vytvoření řešení. |
|
|
|
if uloha.cislo_zadani.zlomovy_deadline_pro_papirove_cislo() is not None: |
|
|
|
# combine, abychom dostali plný čas a ne jen datum |
|
|
|
cas_doruceni = datetime.datetime.combine(uloha.cislo_zadani.datum_deadline, datetime.datetime.min.time()) - datetime.timedelta(days=random.randint(0, 40)) - datetime.timedelta(minutes=random.randint(0, 60*24)) |
|
|
|
cas_doruceni = uloha.cislo_zadani.deadline_v_cisle.first().deadline - datetime.timedelta(days=random.randint(0, 40)) - datetime.timedelta(minutes=random.randint(0, 60*24)) |
|
|
|
# astimezone, protože jinak vyhazuje warning o nenastavené TZ |
|
|
|
res = Reseni.objects.create(forma=rnd.choice(Reseni.FORMA_CHOICES)[0], cas_doruceni=cas_doruceni.astimezone(datetime.timezone.utc)) |
|
|
|
else: |
|
|
|
@ -444,7 +444,6 @@ def gen_cisla(rnd, rocniky): |
|
|
|
rocnik = rocnik, |
|
|
|
poradi = str(ci), |
|
|
|
datum_vydani=vydano, |
|
|
|
datum_deadline=deadline, |
|
|
|
verejne_db=True, |
|
|
|
verejna_vysledkovka=True |
|
|
|
) |
|
|
|
@ -452,6 +451,12 @@ def gen_cisla(rnd, rocniky): |
|
|
|
node2.succ = node |
|
|
|
node2.root = rocnik.rocniknode |
|
|
|
cislo.save() |
|
|
|
deadline = Deadline.objects.create( |
|
|
|
cislo=cislo, |
|
|
|
deadline=deadline, |
|
|
|
typ=Deadline.TYP_CISLA |
|
|
|
) |
|
|
|
deadline.save() |
|
|
|
node = node2 |
|
|
|
if otec: |
|
|
|
otec = False |
|
|
|
|
