Changeset 6915 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

20 Oct 2011, 17:14:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Move year_range and academic_sessions_vocab to waeup.sirp.interfaces.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• interfaces.py (modified) (1 diff)
• utils.py (modified) (1 diff)
• vocabularies.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -4 +4 @@
 from zope.interface.exceptions import Invalid
 from zope import schema
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import IWAeUPObject, academic_sessions_vocab
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.university.vocabularies import CourseSource, study_modes

main/waeup.sirp/trunk/src/waeup/sirp/students/utils.py

@@ -3 +3 @@
 
 from random import SystemRandom as r
-from waeup.sirp.students.vocabularies import academic_sessions_vocab
+from waeup.sirp.interfaces import academic_sessions_vocab
 
 def generate_student_id(students,letter):

main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

@@ -1 +1 @@
 """Vocabularies and sources for the student section.
 """
-from datetime import datetime
 from zope.component import getUtility, queryUtility
 from zope.catalog.interfaces import ICatalog
@@ -9 +8 @@
 from zc.sourcefactory.basic import BasicSourceFactory
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleWAeUPVocabulary, academic_sessions_vocab
 from waeup.sirp.students.lgas import LGAS
 from waeup.sirp.university.vocabularies import course_levels
-
-
-
-def year_range():
-    curr_year = datetime.now().year
-    return range(curr_year - 2, curr_year + 5)
-
-def academic_sessions():
-    curr_year = datetime.now().year
-    year_range = range(curr_year - 10, curr_year + 2)
-    return [('%s/%s' % (year,year+1), year) for year in year_range]
-
-academic_sessions_vocab = SimpleWAeUPVocabulary(*academic_sessions())
 
 lgas_vocab = SimpleWAeUPVocabulary(