Browse Source

Merge branch 'data_migrations' into test

middleware_test
Jonas Havelka 3 years ago
parent
commit
3ae2b60bc0
  1. 4
      seminar/models.py

4
seminar/models.py

@ -312,7 +312,7 @@ class Resitel(SeminarModelBase):
vsechna_reseni = self.reseni_set.all() vsechna_reseni = self.reseni_set.all()
vsechna_hodnoceni = Hodnoceni.objects.filter( vsechna_hodnoceni = Hodnoceni.objects.filter(
reseni__in=vsechna_reseni) 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): 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) novejsi_hodnoceni = Hodnoceni.objects.filter(reseni__in=self.reseni_set.all()).difference(hodnoceni_do_25_rocniku)
def body_z_hodnoceni(hh : list): 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) stare_body = body_z_hodnoceni(hodnoceni_do_25_rocniku)
if body is None: if body is None:

Loading…
Cancel
Save