diff --git a/galerie/forms.py b/galerie/forms.py index 63b9e098..02688629 100644 --- a/galerie/forms.py +++ b/galerie/forms.py @@ -1,7 +1,7 @@ #coding: utf-8 from django import forms -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni class KomentarForm(forms.Form): komentar = forms.CharField(label = "Komentář:", max_length = 300, required=False) diff --git a/galerie/models.py b/galerie/models.py index 2745848d..765a2154 100644 --- a/galerie/models.py +++ b/galerie/models.py @@ -8,7 +8,7 @@ from imagekit.processors import ResizeToFit, Transpose import os -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni VZDY=0 ORG=1 diff --git a/galerie/views.py b/galerie/views.py index 157211c9..4fa44c11 100644 --- a/galerie/views.py +++ b/galerie/views.py @@ -8,7 +8,7 @@ from django.template import RequestContext from datetime import datetime from galerie.models import Obrazek, Galerie -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni from galerie.forms import KomentarForm, NewGalerieForm def zobrazit(galerie, request): diff --git a/personalni/views.py b/personalni/views.py index bb170baa..e71dbf5c 100644 --- a/personalni/views.py +++ b/personalni/views.py @@ -13,7 +13,7 @@ from odevzdavatko.models import Hodnoceni from .models import * from tvorba.models import Tema, Uloha, Clanek from seminar.models.nastaveni import Nastaveni -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni from .forms import PrihlaskaForm, ProfileEditForm, PoMaturiteProfileEditForm from datetime import date diff --git a/prednasky/admin.py b/prednasky/admin.py index b3021463..19eace7f 100644 --- a/prednasky/admin.py +++ b/prednasky/admin.py @@ -5,7 +5,7 @@ from django.utils.safestring import mark_safe from django.utils.html import escape from .models import Prednaska, Seznam, STAV_NAVRH -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni class Seznam_PrednaskaInline(admin.TabularInline): diff --git a/prednasky/models.py b/prednasky/models.py index 172c067c..13b370b8 100644 --- a/prednasky/models.py +++ b/prednasky/models.py @@ -1,7 +1,7 @@ from django.db import models -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni from personalni.models import Organizator STAV_NAVRH = 1 diff --git a/prednasky/views.py b/prednasky/views.py index 17835bbe..368c98d9 100644 --- a/prednasky/views.py +++ b/prednasky/views.py @@ -6,7 +6,7 @@ from django.db.models import Sum from django.forms import Form from prednasky.models import Prednaska, Hlasovani, Seznam, STAV_NAVRH -from seminar.models.soustredeni import Soustredeni +from soustredeni.models import Soustredeni from personalni.models import Osoba def newPrednaska(request): diff --git a/seminar/admin.py b/seminar/admin.py index ed88d24a..b237c686 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -12,7 +12,7 @@ from django.utils.safestring import mark_safe from tvorba.models import Rocnik, Cislo, Deadline, ZmrazenaVysledkovka, Problem, Uloha, Tema, Clanek from seminar.models.nastaveni import Nastaveni from personalni.models import Resitel -from seminar.models.soustredeni import Konfera +from soustredeni.models import Konfera from seminar.models.novinky import Novinky from seminar.models.pomocne import Text, Obrazek diff --git a/seminar/migrations/0001_squashed_0098_auto_20210906_0305.py b/seminar/migrations/0001_squashed_0098_auto_20210906_0305.py index 18c237b2..c6d8bccd 100644 --- a/seminar/migrations/0001_squashed_0098_auto_20210906_0305.py +++ b/seminar/migrations/0001_squashed_0098_auto_20210906_0305.py @@ -8,7 +8,7 @@ import django.utils.timezone import django_countries.fields import imagekit.models.fields from odevzdavatko.models import generate_filename -from seminar.models.soustredeni import generate_filename_konfera +from soustredeni.models import generate_filename_konfera from tvorba.models import cislo_pdf_filename, cislo_png_filename import taggit.managers diff --git a/seminar/migrations/0041_konfery.py b/seminar/migrations/0041_konfery.py index a61756a4..ba75c8a9 100644 --- a/seminar/migrations/0041_konfery.py +++ b/seminar/migrations/0041_konfery.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -from seminar.models.soustredeni import generate_filename_konfera +from soustredeni.models import generate_filename_konfera class Migration(migrations.Migration): diff --git a/seminar/migrations/0042_auto_20161005_0847.py b/seminar/migrations/0042_auto_20161005_0847.py index bee136e3..c06986c3 100644 --- a/seminar/migrations/0042_auto_20161005_0847.py +++ b/seminar/migrations/0042_auto_20161005_0847.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -from seminar.models.soustredeni import generate_filename_konfera +from soustredeni.models import generate_filename_konfera class Migration(migrations.Migration): diff --git a/seminar/models/__init__.py b/seminar/models/__init__.py index 12835703..912fc3ec 100644 --- a/seminar/models/__init__.py +++ b/seminar/models/__init__.py @@ -1,5 +1,4 @@ from .base import * -from .soustredeni import * from .pomocne import * from .treenode import * from .novinky import * diff --git a/seminar/testutils.py b/seminar/testutils.py index 6c86fd54..8c772073 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -16,7 +16,7 @@ from models.nastaveni import * from personalni.models import * from tvorba.models import * from odevzdavatko.models import * -from seminar.models.soustredeni import * +from soustredeni.models import * from seminar.models.novinky import * from seminar.models.pomocne import * from seminar.models.treenode import * diff --git a/seminar/utils.py b/seminar/utils.py index 4b605c81..90504d5a 100644 --- a/seminar/utils.py +++ b/seminar/utils.py @@ -19,7 +19,7 @@ import logging from personalni.models import Organizator, Resitel, Skola, Prijemce from tvorba.models import Clanek, Rocnik from seminar.models.treenode import CisloNode -from seminar.models.soustredeni import Konfery_Ucastnici, Soustredeni_Ucastnici +from soustredeni.models import Konfery_Ucastnici, Soustredeni_Ucastnici from odevzdavatko.models import Reseni_Resitele import treenode.treelib as t diff --git a/soustredeni/admin.py b/soustredeni/admin.py index df91f0e1..6abf50bb 100644 --- a/soustredeni/admin.py +++ b/soustredeni/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin from django.forms import widgets from django.db import models -from seminar.models.soustredeni import * +from .models import * class SoustredeniUcastniciInline(admin.TabularInline): diff --git a/seminar/models/soustredeni.py b/soustredeni/models.py similarity index 99% rename from seminar/models/soustredeni.py rename to soustredeni/models.py index 0a798e8d..a86992f5 100644 --- a/seminar/models/soustredeni.py +++ b/soustredeni/models.py @@ -9,7 +9,7 @@ from django.conf import settings from personalni.models import Resitel, Organizator -from .base import SeminarModelBase +from seminar.models.base import SeminarModelBase from tvorba.models import Rocnik, Problem, aux_generate_filename logger = logging.getLogger(__name__) diff --git a/soustredeni/views.py b/soustredeni/views.py index 47ddde35..fa267e94 100644 --- a/soustredeni/views.py +++ b/soustredeni/views.py @@ -3,7 +3,7 @@ from django.http import HttpResponse from django.views import generic from django.conf import settings from django.contrib.staticfiles.finders import find -from seminar.models.soustredeni import * +from .models import * from personalni.models import Resitel from seminar.models.nastaveni import Nastaveni import csv diff --git a/vysledkovky/utils.py b/vysledkovky/utils.py index 1edaabec..5afccab0 100644 --- a/vysledkovky/utils.py +++ b/vysledkovky/utils.py @@ -5,7 +5,7 @@ from typing import Union, Iterable # TODO: s pythonem 3.10 přepsat na '|' from tvorba.models import Rocnik, Cislo, Deadline, Problem, Clanek from odevzdavatko.models import Hodnoceni from personalni.models import Resitel -from seminar.models.soustredeni import Konfera +from soustredeni.models import Konfera from django.db.models import Q, Sum from seminar.utils import resi_v_rocniku