Changeset 6255 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

31 May 2011, 07:41:11 (14 years ago)

Author:

Henrik Bettermann

Message:

Implement choice field for entry_session.

Scores must be integers.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py (modified) (5 diffs)

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

@@ -77 +77 @@
     *sorted([(x[1],x[0]) for x in LGAS]))
 
+def year_range():
+    curr_year = datetime.now().year
+    return range(curr_year - 2, curr_year + 5)
+
+def entry_sessions():
+    curr_year = datetime.now().year
+    year_range = range(curr_year - 5, curr_year + 2)
+    return [('%s/%s' % (year,year+1), '%s' % year) for year in year_range]
+
+entry_session_vocab = SimpleWAeUPVocabulary(*entry_sessions())
+
 class CertificateSource(BasicContextualSourceFactory):
     """A certificate source delivers all certificates provided
@@ -107 +118 @@
                     key=lambda value: value.code)
 
-def year_range():
-    curr_year = datetime.now().year
-    return range(curr_year - 2, curr_year + 5)
-
 class GenderSource(BasicSourceFactory):
     """A gender source delivers basically a mapping
@@ -431 +438 @@
         readonly = True,
         )
-    screening_score = schema.TextLine(
+    screening_score = schema.Int(
         title = u'Screening Score',
         required = False,
@@ -445 +452 @@
         required = False,
         )
-    entry_session = schema.TextLine(
-        # XXX: should be choice
+    entry_session = schema.Choice(
+        source = entry_session_vocab,
         title = u'Entry Session',
         required = False,
@@ -475 +482 @@
     omit fields. This has to be done in the respective form page.
     """
-    screening_score = schema.TextLine(
+    screening_score = schema.Int(
         title = u'Screening Score',
         required = False,