Changeset 9115

Timestamp:

28 Aug 2012, 08:13:21 (12 years ago)

Author:

Henrik Bettermann

Message:

The year_range function was only used in applicants. Extend academic session range properly.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/interfaces.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -18 +18 @@
 """Interfaces of the university application package.
 """
+from datetime import datetime
 from grokcore.content.interfaces import IContainer
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
@@ -28 +29 @@
 from waeup.kofa.schema import TextLineChoice, FormattedDate
 from waeup.kofa.interfaces import (
-    IKofaObject, year_range, validate_email,
+    IKofaObject, validate_email,
     SimpleKofaVocabulary)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -40 +41 @@
 
 _marker = object() # a marker different from None
+
+def year_range():
+    curr_year = datetime.now().year
+    return range(curr_year - 2, curr_year + 5)
 
 class RegNumInSource(ValidationError):

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -65 +65 @@
             SimpleTerm(value, value, title) for title, value in terms])
 
-def year_range():
-    curr_year = datetime.now().year
-    return range(1995, curr_year + 5)
-
 def academic_sessions():
     curr_year = datetime.now().year
-    year_range = range(curr_year - 15, curr_year + 2)
+    year_range = range(1995, curr_year + 2)
     return [('%s/%s' % (year,year+1), year) for year in year_range]