diff --git a/seminar/templates/seminar/titulnistrana/titulnistrana.html b/seminar/templates/seminar/titulnistrana/titulnistrana.html
index 39675a3e..f79bbbf1 100644
--- a/seminar/templates/seminar/titulnistrana/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana/titulnistrana.html
@@ -19,17 +19,17 @@ function sousdeadline() {
Do
- {% if typ_deadline == 'soustredeni' %}
+ {% if nejblizsi_deadline.typ == nejblizsi_deadline.TYP_SOUS or nejblizsi_deadline.typ == nejblizsi_deadline.TYP_PRVNI_A_SOUS %}
deadlinu odeslání řešení
pro účast na soustředění
- {% elif typ_deadline == 'preddeadline' %} 1. deadlinu aktuálního čísla
{% else %} deadlinu aktuálního čísla
{% endif %}zbývá:
- {{nejblizsi_deadline|timeuntil}}
+ {{nejblizsi_deadline.deadline|timeuntil}}
{% endif %}
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py
index 9ac849c8..7cf79d9f 100644
--- a/seminar/views/views_all.py
+++ b/seminar/views/views_all.py
@@ -261,23 +261,8 @@ class TitulniStranaView(generic.ListView):
context = super(TitulniStranaView, self).get_context_data(**kwargs)
nastaveni = get_object_or_404(Nastaveni)
- deadline_soustredeni = (nastaveni.aktualni_cislo.datum_deadline_soustredeni, "soustredeni")
- preddeadline = (nastaveni.aktualni_cislo.datum_preddeadline, "preddeadline")
- deadline = (nastaveni.aktualni_cislo.datum_deadline, "deadline")
-
- try:
- nejblizsi_deadline = sorted(filter(lambda dl: dl[0] is not None and dl[0] >= date.today(), [deadline_soustredeni, preddeadline, deadline]))[0]
- if nejblizsi_deadline[0] == deadline_soustredeni[0]:
- nejblizsi_deadline = deadline_soustredeni
- except IndexError:
- nejblizsi_deadline = (None, None) # neni zadna aktualni deadline
-
- if nejblizsi_deadline[0] is not None:
- context['nejblizsi_deadline'] = datetime.combine(nejblizsi_deadline[0], datetime.max.time())
- else:
- context['nejblizsi_deadline'] = None
-
- context['typ_deadline'] = nejblizsi_deadline[1]
+ deadline = m.Deadline.objects.filter(deadline__gte=timezone.now()).order_by("deadline").first()
+ context['nejblizsi_deadline'] = deadline
# Aktuální témata
nazvy_a_odkazy_na_aktualni_temata = []