Přesun kódu modelů soustředění

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)

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

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):

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

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):

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

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):

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
 

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
 

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):

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):

seminar/models/__init__.py

@@ -1,5 +1,4 @@
 from .base import *
-from .soustredeni import *
 from .pomocne import *
 from .treenode import *
 from .novinky import *

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 *

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
 

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):

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__)

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

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