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

Merge branch 'data_migrations' into test

Browse source
This commit is contained in:
Jonas Havelka 2021-06-15 22:23:26 +02:00
commit 3ae2b60bc0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
seminar/models.py
View file

@ -312,7 +312,7 @@ class Resitel(SeminarModelBase):
vsechna_reseni = self.reseni_set.all()
vsechna_hodnoceni = Hodnoceni.objects.filter(
reseni__in=vsechna_reseni)
return sum(h.body for h in list(vsechna_hodnoceni) if h is not None)
return sum(h.body for h in list(vsechna_hodnoceni) if h.body is not None)
def get_titul(self, body=None):
@ -360,7 +360,7 @@ class Resitel(SeminarModelBase):
novejsi_hodnoceni = Hodnoceni.objects.filter(reseni__in=self.reseni_set.all()).difference(hodnoceni_do_25_rocniku)
def body_z_hodnoceni(hh : list):
return sum(h.body for h in hh if h is not None)
return sum(h.body for h in hh if h.body is not None)
stare_body = body_z_hodnoceni(hodnoceni_do_25_rocniku)
if body is None: