pre-pull fix

smash/web/forms.py

 from django import forms
 from django.forms import ModelForm
 from .models import *
+from datetime import datetime
 
 """
-Possibl redundancy, but if need arises, contents of forms can be easily customized
+Possible redundancy, but if need arises, contents of forms can be easily customized
 """
 
+CURRENT_YEAR = datetime.now().year
+YEAR_CHOICES=tuple(range(CURRENT_YEAR,CURRENT_YEAR - 120, -1))
+
+
 class SubjectAddForm(ModelForm):
+    date_born = forms.DateField(label='Date of birth',
+        widget=forms.SelectDateWidget(years=YEAR_CHOICES)
+    )
+
     class Meta:
         model = Subject
         fields = '__all__'
@@ -19,6 +28,10 @@ class SubjectDetailForm(ModelForm):
 
 
 class SubjectEditForm(ModelForm):
+    date_born = forms.DateField(label='Date of birth',
+        widget=forms.SelectDateWidget(years=YEAR_CHOICES)
+    )
+
     class Meta:
         model = Subject
         fields = '__all__'
@@ -54,11 +67,24 @@ class AppointmentAddForm(ModelForm):
         exclude = ['is_finished']
 
 class VisitDetailForm(ModelForm):
+    datetime_begin = forms.DateField(label="Visit begins on",
+        widget=forms.SelectDateWidget(years=YEAR_CHOICES)
+    )
+    datetime_end = forms.DateField(label="Visit ends on",
+        widget=forms.SelectDateWidget(years=YEAR_CHOICES)
+    )
+
     class Meta:
         model = Visit
         exclude = ['is_finished']
 
 class VisitAddForm(ModelForm):
+    datetime_begin = forms.DateField(label="Visit begins on",
+        widget=forms.SelectDateWidget(years=YEAR_CHOICES)
+    )
+    datetime_end = forms.DateField(label="Visit ends on",
+        widget=forms.SelectDateWidget(years=YEAR_CHOICES)
+    )
     class Meta:
         model = Visit
         exclude = ['is_finished']

smash/web/views.py

@@ -9,6 +9,7 @@ from django.forms import modelformset_factory
 from django.shortcuts import render
 from django.db.models import Q
 import collections
+import datetime
 
 def index(request):
 	if request.user.is_authenticated():
@@ -248,8 +249,6 @@ def suggest_details(Appointment appoint):
 """
 
 
-
-
 def assignments(request):
 	futureDate = datetime.datetime.now()+datetime.timedelta(days=93)
 	planning_list = Appointment.objects.filter(datetime_when__isnull=True, visit__datetime_begin__lt = futureDate)