From 91e88a31fbbd2ccdf18532fa627bf52072d405a5 Mon Sep 17 00:00:00 2001
From: Anet <anet@erebus>
Date: Tue, 30 Apr 2019 21:12:32 +0200
Subject: [PATCH 1/2] admin: pohadka nema timestamp, priloha reseni ma misto
 timestampu vytvoreno

---
 seminar/admin.py  | 7 +++----
 seminar/models.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/seminar/admin.py b/seminar/admin.py
index 5df03dda..ceff6759 100644
--- a/seminar/admin.py
+++ b/seminar/admin.py
@@ -101,8 +101,8 @@ class CisloInline(admin.TabularInline):
 
 class PrilohaReseniInline(admin.StackedInline):
     model = PrilohaReseni
-    fields = ['timestamp', 'soubor', 'poznamka']
-    readonly_fields = ['timestamp']
+    fields = ['vytvoreno', 'soubor', 'poznamka']
+    readonly_fields = ['vytvoreno']
     formfield_overrides = {
         models.TextField: {'widget': forms.TextInput},
     }
@@ -381,8 +381,7 @@ class PohadkaAdmin(VersionAdmin):
         'get_rocnik',
         'get_kod_ulohy',
         'uloha',
-        'autor',
-        'timestamp'
+        'autor'
     ]
 
     get_form = get_form_predvypln_autora
diff --git a/seminar/models.py b/seminar/models.py
index 02d8f132..c0f2db0d 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -850,7 +850,7 @@ class PrilohaReseni(SeminarModelBase):
 		db_table = 'seminar_priloha_reseni'
 		verbose_name = 'Příloha řešení'
 		verbose_name_plural = 'Přílohy řešení'
-		ordering = ['reseni', 'timestamp']
+		ordering = ['reseni', 'vytvoreno']
 
 	# Interní ID
 	id = models.AutoField(primary_key = True)

From 72f309936621dc4c879791280ed0d2d06f387038 Mon Sep 17 00:00:00 2001
From: LEdoian <tap9701@gmail.com>
Date: Tue, 30 Apr 2019 21:19:52 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Fixy=20probl=C3=A9m=C5=AF=20s=20abstraktnos?=
 =?UTF-8?q?t=C3=AD=20modelu=20a=20=C5=A1patn=C3=BDch=20identifik=C3=A1tor?=
 =?UTF-8?q?=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/models.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/seminar/models.py b/seminar/models.py
index 02d8f132..3d5398d8 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -561,7 +561,9 @@ class Soustredeni(SeminarModelBase):
 class Problem(SeminarModelBase):
 
 	class Meta:
-		abstract = True
+		# Není abstraktní, protože se na něj jinak nedají dělat ForeignKeys.
+		# TODO: Udělat to polymorfní (pomocí django-polymorphic), abychom dostali po těch vazbách přímo tu úlohu/témátko vč. fieldů, které nejsou součástí modelu Problem?
+		#abstract = True
 		verbose_name = 'Problém'
 		verbose_name_plural = 'Problémy'
 		ordering = ['nazev']
@@ -738,7 +740,8 @@ class Reseni(SeminarModelBase):
 		db_table = 'seminar_reseni'
 		verbose_name = 'Řešení'
 		verbose_name_plural = 'Řešení'
-		ordering = ['-problem_id', 'resitel']
+		#ordering = ['-problem', 'resitele']	# FIXME: Takhle to chceme, ale nefunguje to.
+		ordering = ['-cas_doruceni']
 
 	# Interní ID
 	id = models.AutoField(primary_key = True)
@@ -850,7 +853,7 @@ class PrilohaReseni(SeminarModelBase):
 		db_table = 'seminar_priloha_reseni'
 		verbose_name = 'Příloha řešení'
 		verbose_name_plural = 'Přílohy řešení'
-		ordering = ['reseni', 'timestamp']
+		ordering = ['reseni', 'vytvoreno']
 
 	# Interní ID
 	id = models.AutoField(primary_key = True)