TitulniStranaView: Preddeadline přidán do contextu

seminar/views/views_all.py

@@ -24,7 +24,7 @@ from seminar import utils, treelib
 from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm
 import seminar.forms as f
 
-from datetime import timedelta, date, datetime
+from datetime import timedelta, date, datetime, MAXYEAR
 from django.utils import timezone
 from itertools import groupby
 from collections import OrderedDict
@@ -260,34 +260,29 @@ class TitulniStranaView(generic.ListView):
 		context = super(TitulniStranaView, self).get_context_data(**kwargs)
 		nastaveni = get_object_or_404(Nastaveni)
 		
-		# zjisteni spravneho terminu
-		if nastaveni.aktualni_cislo.datum_deadline_soustredeni:
-			cas_deadline_soustredeni = nastaveni.aktualni_cislo.\
-				datum_deadline_soustredeni
-			if (datetime.now().date() <= cas_deadline_soustredeni):
-				cas_deadline = cas_deadline_soustredeni
-				deadline_soustredeni = True
-			else:
-				cas_deadline = nastaveni.aktualni_cislo.datum_deadline
-				deadline_soustredeni = False
-		else:
-			cas_deadline = nastaveni.aktualni_cislo.datum_deadline
-			deadline_soustredeni = False
-
-		# Pokud neni zverejnene cislo nezverejnuj odpocet
-		if nastaveni.aktualni_cislo.verejne():
-			# pokus se zjistit termin odeslani a pokud neni zadany,
-			# nezverejnuj odpocet
-			context['deadline_soustredeni'] = deadline_soustredeni
+		deadline_soustredeni = (nastaveni.aktualni_cislo.datum_deadline_soustredeni, "soustredeni")
+		preddeadline = (nastaveni.aktualni_cislo.datum_preddeadline, "preddeadline")
+		deadline = (nastaveni.aktualni_cislo.datum_deadline, "deadline")
+
 		try:
-				context['dead'] = datetime.combine(cas_deadline,
-												 datetime.max.time())
+			nejblizsi_deadline = sorted(filter(lambda dl: dl[0] is not None and dl[0] >= date.today(), [deadline_soustredeni, preddeadline, deadline]))[0]
+		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]
 		context['ted'] = datetime.now()	
-			except:
-				context['dead'] = None
+		
+		if (nejblizsi_deadline[1] == 'soustredeni'):
+			context['dead'] = datetime.combine(deadline_soustredeni[0], datetime.max.time())
+			context['deadline_soustredeni'] = True
 		else:
-			context['dead'] = None
-			context['deadline_soustredeni'] = deadline_soustredeni
+			context['dead'] = context['nejblizsi_deadline'] 
+			context['deadline_soustredeni'] = False
 
 		# Aktuální témata
 		nazvy_a_odkazy_na_aktualni_temata = []