Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/interfaces.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/interfaces.py (modified) (6 diffs)

main/waeup.kofa/branches/uli-zc-async/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
@@ -30 +29 @@
 from waeup.kofa.schema import TextLineChoice, FormattedDate
 from waeup.kofa.interfaces import (
-    IKofaObject, validate_email,
+    IKofaObject, year_range, validate_email,
     SimpleKofaVocabulary)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -42 +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):
@@ -328 +323 @@
     application_number = Attribute('The key under which the record is stored')
 
-    suspended = schema.Bool(
-        title = _(u'Account suspended'),
-        default = False,
-        required = False,
-        )
-
     applicant_id = schema.TextLine(
         title = _(u'Applicant Id'),
@@ -404 +393 @@
         required = False,
         )
+    screening_venue = schema.TextLine(
+        title = _(u'Screening Venue'),
+        required = False,
+        )
+    screening_score = schema.Int(
+        title = _(u'Screening Score'),
+        required = False,
+        )
     student_id = schema.TextLine(
         title = _(u'Student Id'),
@@ -463 +460 @@
         required = False,
         )
+    screening_score = schema.Int(
+        title = _(u'Screening Score'),
+        required = False,
+        readonly = True,
+        )
+    screening_venue = schema.TextLine(
+        title = _(u'Screening Venue'),
+        required = False,
+        readonly = True,
+        )
     course_admitted = schema.Choice(
         title = _(u'Admitted Course of Study'),