From 14d834209c0fd4bdc40004e7df4e3d46d92877fe Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Tue, 23 Apr 2019 21:32:39 +0200
Subject: [PATCH 1/4] Novy model kompletni.

---
 seminar/models.py | 80 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/seminar/models.py b/seminar/models.py
index 10d05395..99bbcc78 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -104,7 +104,7 @@ class Skola(SeminarModelBase):
 			blank=True, null=True)
 
 	def __str__(self):
-		return force_unicode(u'%s, %s, %s' % (self.nazev,							self.ulice, self.mesto))
+		return force_unicode(u'%s, %s, %s' % (self.nazev, self.ulice, self.mesto))
 
 @reversion.register(ignore_duplicates=True)
 @python_2_unicode_compatible
@@ -1066,6 +1066,84 @@ class Text(SeminarModelBase):
 		help_text=u'Text ke zveřejnění v čísle')
 	
 	# obrázky mají návaznost opačným směrem (vazba z druhé strany)
+class TreeNode(models.Model):
+	class Meta:
+		abstract = True
+	root = models.ForeignKey('self',
+		null = True,
+		blank = False,
+		on_delete = models.SET_NULL, # Vrcholy s null kořenem jsou sirotci bez ročníku 
+	first_child = models.ForeignKey('self',
+		null = True,
+		blank = True,
+		on_delete=models.SET_NULL,
+		verbose_name="první potomek")
+	succ = models.ForeignKey('self',
+		null = True,
+		blank = True,
+		on_delete=models.SET_NULL,
+		verbose_name="další element na stejné úrovni")
+
+class RocnikNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_rocnik'
+		verbose_name = 'Ročník (Node)'
+		verbose_name_plural = 'Ročníky (Node)'
+	rocnik = models.ForeignKey(Rocnik,
+		on_delete = models.PROTECT, # Pokud chci mazat ročník, musím si Node pořešit ručně
+		verbose_name = "ročník")
+
+class CisloNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_cislo'
+		verbose_name = 'Číslo (Node)'
+		verbose_name_plural = 'Čísla (Node)'
+	cislo = models.ForeignKey(Cislo,
+		on_delete = models.PROTECT, # Pokud chci mazat číslo, musím si Node pořešit ručně
+		verbose_name = "číslo")
+
+class MezicisloNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_mezicislo'
+		verbose_name = 'Mezičíslo (Node)'
+		verbose_name_plural = 'Mezičísla (Node)'
+
+class TemaVCisleNode(TreeNode):
+	""" Obsahuje příspěvky k tématu v daném čísle """
+	class Meta:
+		db_table = 'seminar_nodes_temavcisle'
+		verbose_name = 'Téma v čísle (Node)'
+		verbose_name_plural = 'Témata v čísle (Node)'
+	tema = models.ForeignKey(Tema,
+		on_delete=models.PROTECT, # Pokud chci mazat téma, musím si Node pořešit ručně
+		verbose_name = "téma v čísle")
+
+class KonferaNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_konfera'
+		verbose_name = 'Konfera (Node)'
+		verbose_name_plural = 'Konfery (Node)'
+
+class ClanekNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_clanek'
+		verbose_name = 'Článek (Node)'
+		verbose_name_plural = 'Články (Node)'
+
+class UlohaNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_uloha'
+		verbose_name = 'Úloha (Node)'
+		verbose_name_plural = 'Úlohy (Node)'
+
+class TextNode(TreeNode):
+	class Meta:
+		db_table = 'seminar_nodes_obsah'
+		verbose_name = 'Text (Node)'
+		verbose_name_plural = 'Text (Node)'
+	text = models.ForeignKey(Text,
+		on_delete=models.PROTECT,
+		verbose_name = 'text')
 
 ## FIXME: Logiku přesunout do views.
 #@python_2_unicode_compatible

From 1b8d98af5b13836c2cb333282e4f7971a4d37de8 Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Tue, 23 Apr 2019 21:33:27 +0200
Subject: [PATCH 2/4] Schema noveho modelu.

---
 Schema_new.dia | Bin 14742 -> 14335 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Schema_new.dia b/Schema_new.dia
index 3e11da786b2d40aa343fd2d08ae362d79a54fa47..d7a38dbdaa369012ffa94b3dddbf5ebc54f737be 100644
GIT binary patch
literal 14335
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
I+Yb=`53G$aV*mgE

literal 14742
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


From 90dc3a04f568bbbc9efa5c70de6f46be48c67bb5 Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Tue, 23 Apr 2019 22:25:18 +0200
Subject: [PATCH 3/4] Opravy poli podle noveho modelu.

---
 seminar/admin.py                       |  62 +++---
 seminar/autocomplete_light_registry.py |   6 +-
 seminar/models.py                      | 274 +++++++++++++------------
 seminar/views.py                       |   8 +-
 4 files changed, 178 insertions(+), 172 deletions(-)

diff --git a/seminar/admin.py b/seminar/admin.py
index 29363f68..1f919ef0 100644
--- a/seminar/admin.py
+++ b/seminar/admin.py
@@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse
 
 from django.contrib.auth.models import User
 
-from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Novinky, Organizator, Prispevek, Pohadka, Konfera
+from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Novinky, Organizator, Pohadka, Konfera, Uloha
 from autocomplete_light import shortcuts as autocomplete_light
 
 
@@ -124,9 +124,9 @@ class ProblemInline(admin.TabularInline):
 
 
 class ReseniKProblemuInline(admin.TabularInline):
-    form = autocomplete_light.modelform_factory(Reseni, autocomplete_fields=['resitel'], fields=['resitel'])
+    form = autocomplete_light.modelform_factory(Reseni, autocomplete_fields=['resitele'], fields=['resitele'])
     model = Reseni
-    fields = ['resitel', 'forma', 'body', 'cislo_body', 'timestamp', 'poznamka']
+    fields = ['resitele', 'forma', 'body', 'cislo_body', 'timestamp', 'poznamka']
     readonly_fields = ['timestamp']
     extra = 0
     formfield_overrides = {
@@ -136,7 +136,7 @@ class ReseniKProblemuInline(admin.TabularInline):
 
     def get_queryset(self, request):
         qs = super(ReseniKProblemuInline, self).get_queryset(request)
-        return qs.select_related('problem', 'cislo_body', 'resitel')
+        return qs.select_related('problem', 'cislo_body', 'resitele')
 
     # Potenciální DB HOG (cislo_body se dotazovalo na cisla pri kazdem zobrazeni jejich selectu ...)
     def formfield_for_dbfield(self, db_field, **kwargs):
@@ -323,13 +323,13 @@ admin.site.register(Rocnik, RocnikAdmin)
 ### Reseni
 
 class ReseniAdmin(VersionAdmin):
-    form = autocomplete_light.modelform_factory(Reseni, autocomplete_fields=['problem', 'resitel'], fields=['problem', 'resitel'])
+    #form = autocomplete_light.modelform_factory(Reseni, autocomplete_fields=['problem', 'resitele'], fields=['problem', 'resitele'])
     fieldsets = [
-        (None,              {'fields': ['problem', 'resitel', 'forma', 'body', 'cislo_body', 'timestamp']}),
+        (None,              {'fields': ['problem', 'resitele', 'forma', 'body', 'cislo_body', 'timestamp']}),
         (u'Poznámky',       {'fields': ['poznamka']}),
         ]
     readonly_fields = ['timestamp']
-    list_display = ['problem', 'resitel', 'forma', 'body', 'timestamp', 'cislo_body']
+    list_display = ['problem', 'resitele', 'forma', 'body', 'timestamp', 'cislo_body']
     list_filter = ['body', 'timestamp', 'forma']
     search_fields = []
     inlines = [PrilohaReseniInline]
@@ -337,7 +337,7 @@ class ReseniAdmin(VersionAdmin):
 
     def get_queryset(self, request):
         qs = super(ReseniAdmin, self).get_queryset(request)
-        return qs.select_related('resitel', 'problem', 'cislo_body')
+        return qs.select_related('resitele', 'problem', 'cislo_body')
 
 admin.site.register(Reseni, ReseniAdmin)
 
@@ -350,7 +350,7 @@ class PohadkaAdminForm(forms.ModelForm):
         exclude = []
     autor = UserModelChoiceField(User.objects.filter(is_staff=True))
     uloha = forms.ModelChoiceField(
-        Problem.objects.filter(typ=Problem.TYP_ULOHA)
+        Uloha.objects.all()
     )
 
     def __init__(self, *args, **kwargs):
@@ -402,15 +402,15 @@ from autocomplete_light.contrib.taggit_field import TaggitField, TaggitWidget
 
 
 class ProblemAdminForm(forms.ModelForm):
-    text_zadani = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_zadani'))
-    text_reseni = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_reseni'))
-    text_org = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_org'))
+    #text_zadani = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_zadani'))
+    #text_reseni = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_reseni'))
+    #text_org = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_org'))
     zamereni = TaggitField(widget=TaggitWidget('TagAutocomplete'), required=False)
     autor = UserModelChoiceField(User.objects.filter(is_staff=True))
     opravovatel = UserModelChoiceField(User.objects.filter(is_staff=True), required=False)
     class Meta:
         model = Problem
-        exclude = []
+        exclude = ['nadproblem']
 
     def __init__(self, *args, **kwargs):
         super(ProblemAdminForm, self).__init__(*args, **kwargs)
@@ -476,7 +476,8 @@ class ProblemNavrhAdmin(ProblemAdmin):
     get_form = get_form_predvypln_autora
 
 
-create_modeladmin(ProblemNavrhAdmin, Problem, 'ProblemNavrh', verbose_name=u'Problém (návrh)', verbose_name_plural=u'Problémy (návrhy)')
+#FIXME
+#create_modeladmin(ProblemNavrhAdmin, Problem, 'ProblemNavrh', verbose_name=u'Problém (návrh)', verbose_name_plural=u'Problémy (návrhy)')
 
 
 class ProblemZadanyAdmin(ProblemAdmin):
@@ -529,27 +530,28 @@ class ProblemZadanyAdmin(ProblemAdmin):
 
     get_form = get_form_predvypln_autora
 
-create_modeladmin(ProblemZadanyAdmin, Problem, 'ProblemZadany', verbose_name=u'Problém (zadaný)', verbose_name_plural=u'Problémy (zadané)')
+#FIXME
+#create_modeladmin(ProblemZadanyAdmin, Problem, 'ProblemZadany', verbose_name=u'Problém (zadaný)', verbose_name_plural=u'Problémy (zadané)')
 
 #admin.site.register(Problem, ProblemAdmin)
 
 ### Prispevek (k tematkum)
 
-class PrispevekAdminForm(forms.ModelForm):
-    text_org = forms.CharField(widget=CKEditorUploadingWidget(), required=False,
-            **field_labels(Prispevek, 'text_org'))
-    text_resitel = forms.CharField(widget=CKEditorUploadingWidget(), required=False,
-            **field_labels(Prispevek, 'text_resitel'))
-
-    class Meta:
-        model = Prispevek
-        exclude = []
-
-class PrispevekAdmin(VersionAdmin):
-    form = PrispevekAdminForm
-    list_display = ['nazev', 'problem', 'reseni', 'zverejnit']
-
-admin.site.register(Prispevek, PrispevekAdmin)
+#class PrispevekAdminForm(forms.ModelForm):
+#    text_org = forms.CharField(widget=CKEditorUploadingWidget(), required=False,
+#            **field_labels(Prispevek, 'text_org'))
+#    text_resitel = forms.CharField(widget=CKEditorUploadingWidget(), required=False,
+#            **field_labels(Prispevek, 'text_resitel'))
+#
+#    class Meta:
+#        model = Prispevek
+#        exclude = []
+#
+#class PrispevekAdmin(VersionAdmin):
+#    form = PrispevekAdminForm
+#    list_display = ['nazev', 'problem', 'reseni', 'zverejnit']
+#
+#admin.site.register(Prispevek, PrispevekAdmin)
 
 ### Soustredeni
 
diff --git a/seminar/autocomplete_light_registry.py b/seminar/autocomplete_light_registry.py
index 13318877..95364337 100644
--- a/seminar/autocomplete_light_registry.py
+++ b/seminar/autocomplete_light_registry.py
@@ -117,7 +117,7 @@ class ProblemAutocomplete(autocomplete_light.AutocompleteModelBase):
                 popisek = "CHYBA"
             return popisek
         else:
-            return u"%s (%s, %s)" % (p.nazev, p.typ, p.stav)
+            return u"%s (%s)" % (p.nazev, p.stav)
 
     attrs={
         # This will set the input placeholder attribute:
@@ -133,6 +133,8 @@ class ProblemAutocomplete(autocomplete_light.AutocompleteModelBase):
         'class': 'modern-style',
     }
 
-autocomplete_light.register(ProblemAutocomplete)
+#FIXME Nefunguje, nevime proc
+#autocomplete_light.register(ProblemAutocomplete)
+
 
 
diff --git a/seminar/models.py b/seminar/models.py
index 99bbcc78..6810bab7 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -45,67 +45,6 @@ class SeminarModelBase(models.Model):
 	def verejne_url(self):
 		return None
 
-#
-# Mělo by být částečně vytaženo z Aesopa
-# viz https://ovvp.mff.cuni.cz/wiki/aesop/export-skol.
-#
-
-@reversion.register(ignore_duplicates=True)
-@python_2_unicode_compatible
-class Skola(SeminarModelBase):
-
-	class Meta:
-		db_table = 'seminar_skoly'
-		verbose_name = u'Škola'
-		verbose_name_plural = u'Školy'
-		ordering = ['mesto', 'nazev']
-
-	# Interní ID
-	id = models.AutoField(primary_key = True)
-
-	# Aesopi ID "izo:..." nebo "aesop:..."
-	# NULL znamená v exportu do aesopa "ufo"
-	aesop_id = models.CharField(u'Aesop ID', max_length=32, blank=True, default='',
-		help_text=u'Aesopi ID typu "izo:..." nebo "aesop:..."')
-
-	# IZO školy (jen české školy)
-	izo = models.CharField(u'IZO', max_length=32, blank=True,
-		help_text=u'IZO školy (jen české školy)')
-
-	# Celý název školy
-	nazev = models.CharField(u'název', max_length=256,
-		help_text=u'Celý název školy')
-
-	# Zkraceny nazev pro zobrazení ve výsledkovce, volitelné.
-	# Není v Aesopovi, musíme vytvářet sami.
-	kratky_nazev = models.CharField(u'zkrácený název', max_length=256, blank=True,
-		help_text="Zkrácený název pro zobrazení ve výsledkovce")
-
-	# Ulice může být jen číslo
-	ulice = models.CharField(u'ulice', max_length=256)
-
-	mesto = models.CharField(u'město', max_length=256)
-
-	psc = models.CharField(u'PSČ', max_length=32)
-
-	# ISO 3166-1 dvojznakovy kod zeme velkym pismem (CZ, SK)
-	# Ekvivalentní s CharField(max_length=2, default='CZ', ...)
-	stat = CountryField(u'stát', default='CZ',
-		help_text=u'ISO 3166-1 kód země velkými písmeny (CZ, SK, ...)')
-
-	# Jaké vzdělání škpla poskytuje?
-	je_zs = models.BooleanField(u'základní stupeň', default=True)
-	je_ss = models.BooleanField(u'střední stupeň', default=True)
-
-	poznamka = models.TextField(u'neveřejná poznámka', blank=True,
-		help_text=u'Neveřejná poznámka ke škole (plain text)')
-	
-	kontaktni_osoba = models.ForeignKey(Osoba, verbose_name=u'Kontaktní osoba', 
-			blank=True, null=True)
-
-	def __str__(self):
-		return force_unicode(u'%s, %s, %s' % (self.nazev, self.ulice, self.mesto))
-
 @reversion.register(ignore_duplicates=True)
 @python_2_unicode_compatible
 class Osoba(SeminarModelBase):
@@ -185,6 +124,68 @@ class Osoba(SeminarModelBase):
 	def __str__(self):
 		return force_unicode("Osoba({})".format(self.plne_jmeno()))
 
+#
+# Mělo by být částečně vytaženo z Aesopa
+# viz https://ovvp.mff.cuni.cz/wiki/aesop/export-skol.
+#
+
+@reversion.register(ignore_duplicates=True)
+@python_2_unicode_compatible
+class Skola(SeminarModelBase):
+
+	class Meta:
+		db_table = 'seminar_skoly'
+		verbose_name = u'Škola'
+		verbose_name_plural = u'Školy'
+		ordering = ['mesto', 'nazev']
+
+	# Interní ID
+	id = models.AutoField(primary_key = True)
+
+	# Aesopi ID "izo:..." nebo "aesop:..."
+	# NULL znamená v exportu do aesopa "ufo"
+	aesop_id = models.CharField(u'Aesop ID', max_length=32, blank=True, default='',
+		help_text=u'Aesopi ID typu "izo:..." nebo "aesop:..."')
+
+	# IZO školy (jen české školy)
+	izo = models.CharField(u'IZO', max_length=32, blank=True,
+		help_text=u'IZO školy (jen české školy)')
+
+	# Celý název školy
+	nazev = models.CharField(u'název', max_length=256,
+		help_text=u'Celý název školy')
+
+	# Zkraceny nazev pro zobrazení ve výsledkovce, volitelné.
+	# Není v Aesopovi, musíme vytvářet sami.
+	kratky_nazev = models.CharField(u'zkrácený název', max_length=256, blank=True,
+		help_text="Zkrácený název pro zobrazení ve výsledkovce")
+
+	# Ulice může být jen číslo
+	ulice = models.CharField(u'ulice', max_length=256)
+
+	mesto = models.CharField(u'město', max_length=256)
+
+	psc = models.CharField(u'PSČ', max_length=32)
+
+	# ISO 3166-1 dvojznakovy kod zeme velkym pismem (CZ, SK)
+	# Ekvivalentní s CharField(max_length=2, default='CZ', ...)
+	stat = CountryField(u'stát', default='CZ',
+		help_text=u'ISO 3166-1 kód země velkými písmeny (CZ, SK, ...)')
+
+	# Jaké vzdělání škpla poskytuje?
+	je_zs = models.BooleanField(u'základní stupeň', default=True)
+	je_ss = models.BooleanField(u'střední stupeň', default=True)
+
+	poznamka = models.TextField(u'neveřejná poznámka', blank=True,
+		help_text=u'Neveřejná poznámka ke škole (plain text)')
+	
+	kontaktni_osoba = models.ForeignKey(Osoba, verbose_name=u'Kontaktní osoba', 
+			blank=True, null=True)
+
+	def __str__(self):
+		return force_unicode(u'%s, %s, %s' % (self.nazev, self.ulice, self.mesto))
+
+
 class Prijemce(SeminarModelBase):
 	class Meta:
 		db_table = 'seminar_prijemce'
@@ -289,6 +290,8 @@ class Resitel(SeminarModelBase):
 			return 'Prof.'
 		else:
 			return 'Akad.'
+	def __str__():
+		return(force_unicode(u"Řešitel ({})".format(self.osoba.plne_jmeno())))
 
 
 
@@ -448,6 +451,63 @@ class Cislo(SeminarModelBase):
 			return None
 		return c
 
+@reversion.register(ignore_duplicates=True)
+@python_2_unicode_compatible
+class Organizator(SeminarModelBase):
+# zmena dedicnosti z models.Model na SeminarModelBase, potencialni vznik bugu
+
+	osoba = models.ForeignKey(Osoba, verbose_name=u'osoba', related_name='org',
+		help_text=u'osobní údaje organizátora', null=False, blank=False)
+
+	vytvoreno = models.DateTimeField(
+		u'Vytvořeno',
+		default=timezone.now,
+		blank=True,
+		editable=False
+	)
+
+	organizuje_od = models.DateTimeField('Organizuje od', blank=False, null=False)
+	
+	organizuje_do = models.DateTimeField('Organizuje do', blank=True, null=True)
+
+	studuje = models.CharField('Studium aj.', max_length = 256,
+			null = True, blank = True,
+			help_text=u"Např. 'Studuje Obecnou fyziku (Bc.), 3. ročník', "
+			u"'Vystudovala Diskrétní modely a algoritmy (Mgr.)' nebo "
+			u"'Přednáší na MFF'")
+
+	strucny_popis_organizatora = models.TextField(u'Stručný popis organizátora',
+			null = True, blank = True)
+
+	skola = models.CharField(u'Škola, kterou studuje', max_length = 256, null=True, blank=True,
+		help_text=u"Škola, např. MFF, VŠCHT, VUT, ... prostě aby se nemuselo psát do studuje"
+		u"školu, ale jen obor, možnost zobrazit zvlášť")
+
+	def __str__(self):
+		if self.osoba.prezdivka:
+			return u"%s '%s' %s".format(self.osoba.jmeno,
+				self.osoba.prezdivka,
+				self.osoba.prijmeni)
+		else:
+			return u"%s %s".format(self.osoba.jmeno, self.osoba.prijmeni)
+
+	class Meta:
+		verbose_name = 'Organizátor'
+		verbose_name_plural = 'Organizátoři'
+
+class Text(SeminarModelBase):
+	class Meta:
+		db_table = 'seminar_texty'
+		verbose_name = u'text'
+		verbose_name_plural = u'texty'
+
+	na_web = models.TextField(u'text na web', blank=True,
+		help_text=u'Text ke zveřejnění na webu')
+
+	do_cisla = models.TextField(u'text do čísla', blank=True,
+		help_text=u'Text ke zveřejnění v čísle')
+	
+	# obrázky mají návaznost opačným směrem (vazba z druhé strany)
 
 @reversion.register(ignore_duplicates=True)
 @python_2_unicode_compatible
@@ -466,7 +526,7 @@ class Problem(SeminarModelBase):
 	nazev = models.CharField(u'název', max_length=256)
 
 	# Problém má podproblémy
-	nadproblem = models.ForeignKey(Problem, verbose_name=u'nadřazený problém',
+	nadproblem = models.ForeignKey('self', verbose_name=u'nadřazený problém',
 		related_name='nadproblem', null=True, blank=True)
 
 	STAV_NAVRH = 'navrh'
@@ -621,7 +681,7 @@ class Reseni(SeminarModelBase):
 	# Interní ID
 	id = models.AutoField(primary_key = True)
 
-	# Ke každé dvojici řešní a problém existuje nanejvýš jedno hodnocení, doplnění vazby.
+	# Ke každé dvojici řešení a problém existuje nanejvýš jedno hodnocení, doplnění vazby.
 	problem = models.ManyToManyField(Problem, verbose_name=u'problém', help_text=u'Problém',
 		through='Hodnoceni')
 
@@ -670,7 +730,7 @@ class Hodnoceni(SeminarModelBase):
 	class Meta:
 		db_table = 'seminar_hodnoceni'
 		verbose_name = u'Hodnocení'
-		verbose_name_plular = u'Hodnocení'
+		verbose_name_plural = u'Hodnocení'
 	
 	# Interní ID
 	id = models.AutoField(primary_key = True)
@@ -705,21 +765,17 @@ class Hodnoceni(SeminarModelBase):
 # neprojdou pak migrace.  Takže rozlišení funkcí generujících názvy souboru
 # podle adresáře řešíme takto.
 
-##
-## FIXME: Budeme řešit později, pokud to bude potřeba.
-#def generate_filename_konfera(self, filename):
-#	return os.path.join(
-#		settings.SEMINAR_KONFERY_DIR,
-#		aux_generate_filename(self, filename)
-#	)
+def generate_filename_konfera(self, filename):
+	return os.path.join(
+		settings.SEMINAR_KONFERY_DIR,
+		aux_generate_filename(self, filename)
+	)
 
-##
-## FIXME: Budeme řešit později, pokud to bude potřeba.
-#def generate_filename(self, filename):
-#	return os.path.join(
-#		settings.SEMINAR_RESENI_DIR,
-#		aux_generate_filename(self, filename)
-#	)
+def generate_filename(self, filename):
+	return os.path.join(
+		settings.SEMINAR_RESENI_DIR,
+		aux_generate_filename(self, filename)
+	)
 
 
 @reversion.register(ignore_duplicates=True)
@@ -793,49 +849,6 @@ class Pohadka(SeminarModelBase):
 		return force_unicode(uryvek)
 
 
-@reversion.register(ignore_duplicates=True)
-@python_2_unicode_compatible
-class Organizator(SeminarModelBase):
-# zmena dedicnosti z models.Model na SeminarModelBase, potencialni vznik bugu
-
-	osoba = models.ForeignKey(Osoba, verbose_name=u'osoba', related_name='org'
-		help_text=u'osobní údaje organizátora', null=False, blank=False)
-
-	vytvoreno = models.DateTimeField(
-		u'Vytvořeno',
-		default=timezone.now,
-		blank=True,
-		editable=False
-	)
-
-	organizuje_od = models.DateTimeField('Organizuje od', blank=False, null=False)
-	
-	organizuje_do = models.DateTimeField('Organizuje do', blank=True, null=True)
-
-	studuje = models.CharField('Studium aj.', max_length = 256,
-			null = True, blank = True,
-			help_text=u"Např. 'Studuje Obecnou fyziku (Bc.), 3. ročník', "
-			"'Vystudovala Diskrétní modely a algoritmy (Mgr.)' nebo "
-			"'Přednáší na MFF'")
-
-	strucny_popis_organizatora = models.TextField(u'Stručný popis organizátora',
-			null = True, blank = True)
-
-	skola = models.CharField(u'Škola, kterou studuje', max_length = 256, null=True, blank=True,
-		help_text=u"Škola, např. MFF, VŠCHT, VUT, ... prostě aby se nemuselo psát do studuje"
-		"školu, ale jen obor, možnost zobrazit zvlášť")
-
-	def __str__(self):
-		if self.osoba.prezdivka:
-			return u"%s '%s' %s".format(self.osoba.jmeno,
-				self.osoba.prezdivka,
-				self.osoba.prijmeni)
-		else:
-			return u"%s %s".format(self.osoba.jmeno, self.osoba.prijmeni)
-
-	class Meta:
-		verbose_name = 'Organizátor'
-		verbose_name_plural = 'Organizátoři'
 
 
 @reversion.register(ignore_duplicates=True)
@@ -1042,8 +1055,9 @@ class Obrazek(SeminarModelBase):
 	na_web = models.ImageField(u'obrázek na web', upload_to='obrazky/%Y/%m/%d/',
 			null=True, blank=True)
 
-	text = models.ForeignKey(Text, verbose_name='text', help_text=u'text, ve kterém
-		se obrázek vyskytuje', null=False, blank=False) 
+	text = models.ForeignKey(Text, verbose_name='text',
+			help_text=u'text, ve kterém se obrázek vyskytuje', 
+			null=False, blank=False) 
 
 	do_cisla_barevny = models.FileField(u'barevný obrázek do čísla', 
 			help_text = u'Barevná verze obrázku do čísla', 
@@ -1053,19 +1067,6 @@ class Obrazek(SeminarModelBase):
 			help_text = u'Černobílá verze obrázku do čísla', 
 			upload_to = 'obrazky/%Y/%m/%d/', blank=True, null=True)
 
-class Text(SeminarModelBase):
-	class Meta:
-		db_table = 'seminar_texty'
-		verbose_name = u'text'
-		verbose_name_plular = u'texty'
-
-	na_web = models.TextField(u'text na web', blank=True,
-		help_text=u'Text ke zveřejnění na webu')
-
-	do_cisla = models.TextField(u'text do čísla', blank=True,
-		help_text=u'Text ke zveřejnění v čísle')
-	
-	# obrázky mají návaznost opačným směrem (vazba z druhé strany)
 class TreeNode(models.Model):
 	class Meta:
 		abstract = True
@@ -1073,6 +1074,7 @@ class TreeNode(models.Model):
 		null = True,
 		blank = False,
 		on_delete = models.SET_NULL, # Vrcholy s null kořenem jsou sirotci bez ročníku 
+		verbose_name="kořen stromu")
 	first_child = models.ForeignKey('self',
 		null = True,
 		blank = True,
diff --git a/seminar/views.py b/seminar/views.py
index bbb46e81..a98ef653 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -11,8 +11,8 @@ from django.db.models import Q
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.contrib.auth import authenticate, login
 
-from .models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel, Novinky, Soustredeni_Ucastnici, Pohadka, Prispevek
-from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva
+from .models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel, Novinky, Soustredeni_Ucastnici, Pohadka
+#from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva
 from . import utils
 from .unicodecsv import UnicodeWriter
 from .forms import NameForm
@@ -145,8 +145,8 @@ class StareNovinkyView(generic.ListView):
 # Organizatori
 def aktivniOrganizatori(rok=date.today().year):
     return Organizator.objects.exclude(
-        organizuje_do_roku__isnull=False,
-        organizuje_do_roku__lt=rok
+        organizuje_do__isnull=False,
+        organizuje_do__lt=rok
     ).order_by('user__first_name')
 
 

From b678337955afe5bdb7a1c2a022d70bd173e5743e Mon Sep 17 00:00:00 2001
From: LEdoian <tap9701@gmail.com>
Date: Wed, 1 May 2019 00:46:59 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Fix=20clashes=20v=20*Node=20v=C4=9Bcech?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/seminar/models.py b/seminar/models.py
index 48ac2e60..97fee733 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -1095,6 +1095,7 @@ class TreeNode(models.Model):
 	class Meta:
 		abstract = True
 	root = models.ForeignKey('self',
+		related_name="potomci_set",
 		null = True,
 		blank = False,
 		on_delete = models.SET_NULL, # Vrcholy s null kořenem jsou sirotci bez ročníku 
@@ -1105,6 +1106,7 @@ class TreeNode(models.Model):
 		on_delete=models.SET_NULL,
 		verbose_name="první potomek")
 	succ = models.ForeignKey('self',
+		related_name="prev",
 		null = True,
 		blank = True,
 		on_delete=models.SET_NULL,