From d20919cb66dc04a3944c07876558d5e489ad9fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 13 Sep 2015 10:53:27 +0200 Subject: [PATCH] =?UTF-8?q?Nezobrazuj=20ve=20v=C3=BDsledkovce=20sloupce=20?= =?UTF-8?q?pro=20=C4=8D=C3=ADsla=201=20a=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/archiv/rocnik.html | 2 +- seminar/views.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html index b3599954..75a95215 100644 --- a/seminar/templates/seminar/archiv/rocnik.html +++ b/seminar/templates/seminar/archiv/rocnik.html @@ -36,7 +36,7 @@ Jméno R. Odjakživa - {% for c in rocnik.verejna_cisla %} + {% for c in cisla_s_body %} {% if c.verejna_vysledkovka %} {{c.rocnik.rocnik}}.{{ c.cislo }} diff --git a/seminar/views.py b/seminar/views.py index 4eaf8f19..d7845261 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -138,8 +138,11 @@ class RocnikView(generic.DetailView): v.body_rocnik = v.body v.body_cisla = [] + # nezobrazovat výsledky u prvních dvou čísel (jsou nulové) + cisla_s_body = [c for c in context['rocnik'].verejna_cisla() if c.cislo not in ['1', '2']] + #pokud pro dany rok a cislo nema resitel vysledky, ma defaultne 0 - for cis in context['rocnik'].verejna_cisla(): + for cis in cisla_s_body: if cis.verejna_vysledkovka: body_za_cislo = VysledkyZaCislo.objects.filter(cislo__rocnik = context['rocnik']).filter(cislo = cis).filter(resitel = v.resitel) #seznam vysledku se spravnym rocnikem a cislem pro resitele @@ -157,6 +160,7 @@ class RocnikView(generic.DetailView): context['vysledkovka'] = vysledkovka context['temata_v_rocniku'] = temata_v_rocniku + context['cisla_s_body'] = cisla_s_body return context class ProblemView(generic.DetailView):