mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge pull request 'odmeny_podle_petra' (!19) from odmeny_podle_petra into master

Browse source 
Reviewed-on: #19
This commit is contained in:
LEdoian 2023-01-02 21:38:46 +01:00
commit 0e0bd76f28
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
seminar/views/views_all.py
View file

@ -442,17 +442,17 @@ class OdmenyView(generic.TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
fromcislo = Cislo.objects.get(rocnik=self.kwargs.get('frocnik'), poradi=self.kwargs.get('fcislo')) fromcislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('frocnik'), poradi=self.kwargs.get('fcislo'))
tocislo = Cislo.objects.get(rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo')) tocislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo'))
resitele = aktivniResitele(tocislo) resitele = aktivniResitele(tocislo)
def get_diff(from_deadline: Deadline, to_deadline: Deadline): def get_diff(from_deadline: Deadline, to_deadline: Deadline):
frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline) frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline)
tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline) tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline)
outlist = [] outlist = []
for (aid, tbody) in tobody.items(): for resitel in resitele:
fbody = frombody.get(aid,0) fbody = frombody.get(resitel.id, 0)
resitel = Resitel.objects.get(pk=aid) tbody = tobody.get(resitel.id, 0)
ftitul = resitel.get_titul(fbody) ftitul = resitel.get_titul(fbody)
ttitul = resitel.get_titul(tbody) ttitul = resitel.get_titul(tbody)
if ftitul != ttitul: if ftitul != ttitul: