Já už nevím, jak určovat deadliny řešení…

seminar/migrations/0104_hodnoceni_deadline_body.py

@@ -13,28 +13,6 @@ def prirad_deadliny(apps, schema_editor):
     for h in Hodnoceni.objects.all():
         p = h.problem
 
-        try:
-            u = p.uloha
-            if u.cislo_zadani is not None:
-                d = Deadline.objects.filter(cislo=u.cislo_zadani, deadline__gte=h.reseni.cas_doruceni).first()
-                h.deadline_body = d
-                h.save()
-                continue
-
-        except Exception:
-            pass
-
-        try:
-            c = p.clanek
-            if c.cislo is not None:
-                d = Deadline.objects.filter(cislo=c.cislo, deadline__gte=h.reseni.cas_doruceni).first()
-                h.deadline_body = d
-                h.save()
-                continue
-
-        except Exception:
-            pass
-
         try:
             t = p.tema
             d = Deadline.objects.filter(cislo__rocnik=t.rocnik, deadline__gte=h.reseni.cas_doruceni).first()
@@ -48,6 +26,33 @@ def prirad_deadliny(apps, schema_editor):
         except Exception:
             pass
 
+
+        cislo = None
+
+        try:
+            u = p.uloha
+            cislo = u.cislo_zadani
+        except Exception:
+            pass
+
+        try:
+            c = p.clanek
+            if c.cislo is not None:
+                cislo = c.cislo
+        except Exception:
+            pass
+
+        if cislo is None:
+            cislo = h.cislo_body
+
+        if cislo is not None:
+            d = Deadline.objects.filter(cislo=cislo, deadline__gte=h.reseni.cas_doruceni).first()
+            if d is None:
+                d = Deadline.objects.filter(cislo=cislo).last()
+            h.deadline_body = d
+            h.save()
+            continue
+
         log.warning(f"Deadline hodnocení {h.id} se nepodařil určit exaktnějším způsobem. Zkouším další.")
 
         d = Deadline.objects.filter(deadline__gte=h.reseni.cas_doruceni).first()