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

Timestamp:

12 Sep 2011, 16:59:04 (13 years ago)

Author:

Henrik Bettermann

Message:

Add more fields to IStudentStudyCourse and corresponding vocabs (work in progress) + some other minor changes.

Location:

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

Files:

• interfaces.py (modified) (2 diffs)
• vocabularies.py (modified) (2 diffs)

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

@@ -4 +4 @@
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.university.vocabularies import study_modes
 from waeup.sirp.students.vocabularies import (
   year_range, lgas_vocab, CertificateSource, GenderSource,
+  entry_session_vocab, study_levels, verdicts,
   )
 
@@ -126 +128 @@
         )
 
+    current_session = schema.Choice(
+        title = u'Current Session',
+        source = entry_session_vocab,
+        default = None,
+        required = True,
+        )
+
+    current_level = schema.Choice(
+        title = u'Current Level',
+        source = study_levels,
+        default = None,
+        required = True,
+        )
+
+    current_verdict = schema.Choice(
+        title = u'Current Verdict',
+        source = verdicts,
+        default = None,
+        required = True,
+        )
+
+    previous_verdict = schema.Choice(
+        title = u'Previous Verdict',
+        source = verdicts,
+        default = None,
+        required = True,
+        )
+
 class IStudentAccommodation(IWAeUPObject):
     """A container for student accommodation objects.

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

@@ -15 +15 @@
 def entry_sessions():
     curr_year = datetime.now().year
-    year_range = range(curr_year - 5, curr_year + 2)
+    year_range = range(curr_year - 10, curr_year + 2)
     return [('%s/%s' % (year,year+1), '%s' % year) for year in year_range]
 
@@ -22 +22 @@
 lgas_vocab = SimpleWAeUPVocabulary(
     *sorted([(x[1],x[0]) for x in LGAS]))
+
+# This will become a source with probation and
+# splill-over levels too
+study_levels = SimpleWAeUPVocabulary(
+    ('Pre-Studies',0),
+    ('100 (Year 1)',100),
+    ('200 (Year 2)',200),
+    ('300 (Year 3)',300),
+    ('400 (Year 4)',400),
+    ('500 (Year 5)',500),
+    ('600 (Year 6)',600),
+    ('700 (Year 7)',700),
+    ('800 (Year 8)',800),
+    )
+
+verdicts = SimpleWAeUPVocabulary(
+    ('Successful student','A'),
+    ('Student with carryover courses','B'),
+    ('Student on probation','C'),
+    ('Student who were previously on probation','E'),
+    ('Medical case','F'),
+    ('Absent from examination','G'),
+    ('Withheld results','H'),
+    ('Expelled/rusticated/suspended student','I'),
+    ('Temporary withdrawn from the university','J'),
+    ('Unregistered student','K'),
+    ('Referred student','L'),
+    ('Reinstatement','M'),
+    ('Student on transfer','N'),
+    ('NCE-III repeater','O'),
+    ('New 300 level student','X'),
+    ('No previous verdict','Y'),
+    ('Successful student (provisional)','Z'),
+    ('First Class','A1'),
+    ('Second Class Upper','A2'),
+    ('Second Class Lower','A3'),
+    ('Third Class','A4'),
+    ('Pass','A5'),
+    ('Distinction','A6'),
+    ('Credit','A7'),
+    ('Merit','A8'),
+    )
+
 
 class CertificateSource(BasicContextualSourceFactory):