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

Odstrel Modelu Odevzdavatko #64

Merged
zelvuska merged 12 commits from odstrel_modelu_odevzdavatko into master 2024-10-29 19:31:55 +01:00
Conversation 1 Commits 12 Files changed 20 +5 -5
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d288fefecc - Show all commits

2
odevzdavatko/models.py
View file

@ -9,7 +9,7 @@ from django.urls import reverse_lazy
from django.utils import timezone from django.utils import timezone
from django.conf import settings from django.conf import settings
from seminar.models import tvorba as am import seminar.models as am # tvorba
from seminar.models import base as bm from seminar.models import base as bm
from odevzdavatko.utils import vzorecek_na_prepocet, inverze_vzorecku_na_prepocet from odevzdavatko.utils import vzorecek_na_prepocet, inverze_vzorecku_na_prepocet

2
odevzdavatko/testutils.py
View file

@ -1,7 +1,7 @@
import datetime import datetime
import random import random
from seminar.models.odevzdavatko import Reseni, Hodnoceni from odevzdavatko.models import Reseni, Hodnoceni
def gen_reseni_ulohy(rnd, cisla, uloha, pocet_resitelu, poradi_cisla, resitele_cisla, resitele): def gen_reseni_ulohy(rnd, cisla, uloha, pocet_resitelu, poradi_cisla, resitele_cisla, resitele):

2
soustredeni/models.py
View file

@ -10,7 +10,7 @@ from django.conf import settings
from personalni.models import Resitel, Organizator from personalni.models import Resitel, Organizator
from seminar.models.base import SeminarModelBase from seminar.models.base import SeminarModelBase
from seminar.models import tvorba as am import seminar.models as am # tvorba
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
soustredeni/testutils.py
View file

@ -6,7 +6,7 @@ from typing import Sequence
import lorem import lorem
from .models import Soustredeni, Konfera from .models import Soustredeni, Konfera
import seminar.models.tvorba as am import seminar.models as am # tvorba
import personalni.models as pm import personalni.models as pm
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
tvorba/admin.py
View file

@ -9,7 +9,7 @@ from django.utils.safestring import mark_safe
import soustredeni.models import soustredeni.models
from seminar.models.tvorba import Rocnik, ZmrazenaVysledkovka, Deadline, Uloha, Problem, Tema, Clanek, Cislo from seminar.models import Rocnik, ZmrazenaVysledkovka, Deadline, Uloha, Problem, Tema, Clanek, Cislo # tvorba
admin.site.register(Rocnik) admin.site.register(Rocnik)
admin.site.register(ZmrazenaVysledkovka) admin.site.register(ZmrazenaVysledkovka)