From 3dcaeee12c1ba1d7e77d203faf2e45b16a296832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Thu, 6 Oct 2022 12:38:31 +0200 Subject: [PATCH] :'( --- seminar/views/views_all.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 6c05b77a..5300f998 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -491,6 +491,12 @@ class OdmenyView(generic.TemplateView): outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) return outlist + def posledni_deadline_oprava(cislo: Cislo) -> Deadline: + posledni_deadline = cislo.posledni_deadline + if posledni_deadline is None: + return Deadline.objects.filter(Q(cislo__poradi__lt=self.poradi, cislo__rocnik=self.rocnik) | Q(cislo__rocnik__rocnik__lt=self.rocnik.rocnik)).order_by("deadline").last() + return posledni_deadline + context["from_cislo"] = fromcislo context["to_cislo"] = tocislo context["zmeny_prvni_prvni"] = get_diff( @@ -499,10 +505,10 @@ class OdmenyView(generic.TemplateView): ) context["zmeny_prvni_posledni"] = get_diff( fromcislo.zlomovy_deadline_pro_papirove_cislo(), - tocislo.posledni_deadline + posledni_deadline_oprava(tocislo) ) context["zmeny_posledni_prvni"] = get_diff( - fromcislo.posledni_deadline, + posledni_deadline_oprava(fromcislo), tocislo.zlomovy_deadline_pro_papirove_cislo() )