merge

HiSPARC · Oct 24, 2011 · b16cfa7 · 153957 · Mar 19, 2012 · davidfokkema
1 parent c844a39
commit b16cfa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/django_publicdb/analysissessions/forms.py b/django_publicdb/analysissessions/forms.py
@@ -3,13 +3,14 @@
 from django_publicdb.inforecords.models import *
 from datetime import date
 from django.forms.extras.widgets import SelectDateWidget
+todays_year=range(2004,int(date.today().strftime("%Y"))+1)
 
 class SessionRequestForm(forms.Form):
    first_name = forms.CharField(max_length=50)
    sur_name = forms.CharField(max_length=50)
    email = forms.EmailField()
    school = forms.CharField(max_length=50)
    cluster = forms.ModelChoiceField(queryset=inforecords.Cluster.objects.all())
-   start_date = forms.DateField(widget=SelectDateWidget)
+   start_date = forms.DateField(widget=SelectDateWidget(years=todays_year))
    number_of_events = forms.IntegerField() 
 
diff --git a/django_publicdb/jsparc/views.py b/django_publicdb/jsparc/views.py
@@ -103,7 +103,7 @@ def top_lijst(slug):
     return sorted(scores, key=operator.itemgetter('wgh_error'))
 
 def result(request):
-    session_hash = request.GET['session_hash']
+    session_title = request.GET['session_title']
     student_name = request.GET['student_name']
     pk = request.GET['pk']
     lat = request.GET['lat']
@@ -112,7 +112,7 @@ def result(request):
     error_estimate = request.GET['error']
 
     coincidence = AnalyzedCoincidence.objects.get(pk=pk)
-    assert coincidence.session.hash == session_hash
+    assert coincidence.session.title == session_title
     assert coincidence.student.name == student_name
 
     if coincidence.student.name == 'Test student':