diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 3b5c09ea..47bee216 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -8,7 +8,7 @@ Termín odeslání {{ac.cislo}}. série: {{ac.datum_deadline}} {#TODO a co speciální deadline pro účast na soustředění? #} - {% for problem in ac.zadane_problemy.all %} + {% for problem in zadani %} {# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #}

{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} ({{problem.body}}b)

{% autoescape off %}{{problem.text_zadani}}{% endautoescape %} @@ -21,4 +21,3 @@ {% endblock content %} - diff --git a/seminar/views.py b/seminar/views.py index c654f60f..ce202123 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -13,7 +13,8 @@ from . import utils def AktualniZadaniView(request): nastaveni = get_object_or_404(Nastaveni) return render(request, 'seminar/zadani/AktualniZadani.html', - {'nastaveni' : nastaveni, + {'nastaveni': nastaveni, + 'zadani': nastaveni.aktualni_cislo.zadane_problemy.exclude(typ=Problem.TYP_TEMA), }, ) ### Titulni strana