mam/mamweb
11
0
Fork 0
Code Issues Pull requests 10 Projects Wiki Activity Actions

:'(

Browse source
This commit is contained in:
Jonas Havelka 2022-10-06 12:38:31 +02:00
parent e9973ffff0
commit 3dcaeee12c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
seminar/views/views_all.py
View file

@ -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()
)