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

Merge branch 'Petr'

Browse source 
Conflicts:
	seminar/templates/seminar/zadani/AktualniZadani.html
	seminar/views.py
This commit is contained in:
Matěj Kocián 2015-09-07 11:00:48 +02:00
commit 181e9b74e1
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
seminar/templates/seminar/zadani/AktualniZadani.html
View file

@ -10,11 +10,20 @@
{% endif %}
{#TODO a co speciální deadline pro účast na soustředění? #}
{% for problem in zadani %}
{% for sada in problemy %}
{# podnadpisy, kdyz neni zakomentuje se nadpis #}
{% if not sada %}<!--{% endif %}
<h3>{% cycle 'Úlohy' 'Témata' 'Seriál' %}</h3>
{% if not sada %}-->{% endif %}
{# publikace jednotlivych zadani #}
{% for problem in sada %}
{# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #}
<h3>{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} ({{problem.body}}b)</h3>
<h4>{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}}
{# nezobrazuj body, pokud nejsou zadane (typicky u temat)#}
{% if problem.body %}({{problem.body}}b){% endif %}</h4>
{% autoescape off %}{{problem.text_zadani}}{% endautoescape %}
<hr>
{% endfor %}
{% empty %}
Aktuálně nejsou zadané žádné úlohy k řešení.
{% endfor %}

9
seminar/views.py
View file

@ -1,3 +1,5 @@
# coding:utf-8
from django.shortcuts import get_object_or_404, render
from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse
@ -12,9 +14,14 @@ from . import utils
def AktualniZadaniView(request):
nastaveni = get_object_or_404(Nastaveni)
problemy = Problem.objects.filter(cislo_zadani=nastaveni.aktualni_cislo).filter(stav = 'zadany')
ulohy = problemy.filter(typ = 'uloha')
temata = problemy.filter(typ = 'tema')
serialy = problemy.filter(typ = 'serial')
problemy = [ulohy, temata, serialy]
return render(request, 'seminar/zadani/AktualniZadani.html',
{'nastaveni': nastaveni,
'zadani': nastaveni.aktualni_cislo.zadane_problemy.exclude(typ=Problem.TYP_TEMA),
'problemy': problemy,
},
)