Changeset 8823 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

27 Jun 2012, 08:09:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.uniben 8820:HEAD.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• . (modified) (1 prop)
• students/interfaces.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

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

@@ -29 +29 @@
 from waeup.kofa.students.vocabularies import (
     nats_vocab, contextual_reg_num_source)
-from waeup.aaue.interfaces import (
+from kofacustom.nigeria.interfaces import (
     high_qual, high_grade, exam_types, LGASource)
 from waeup.aaue.interfaces import MessageFactory as _

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

@@ -20 +20 @@
 from zope.component import createObject
 from waeup.kofa.interfaces import CLEARED, RETURNING, PAID
-from waeup.kofa.students.utils import StudentsUtils
-from waeup.kofa.students.interfaces import IStudentsUtils
+from kofacustom.nigeria.students.utils import NigeriaStudentsUtils
 from waeup.kofa.accesscodes import create_accesscode
 from waeup.aaue.interfaces import MessageFactory as _
 
-class CustomStudentsUtils(StudentsUtils):
+class CustomStudentsUtils(NigeriaStudentsUtils):
     """A collection of customized methods.
 
     """
-    grok.implements(IStudentsUtils)
 
     def getReturningData(self, student):
@@ -155 +153 @@
         return None, payment
 
-    VERDICTS_DICT = {
-        'NY': 'not yet',
-        'A': 'Successful student',
-        'B': 'Student with carryover courses',
-        'C': 'Student on probation',
-        'D': 'Withdrawn from the faculty',
-        'E': 'Student who were previously on probation',
-        'F': 'Medical case',
-        'G': 'Absent from examination',
-        'H': 'Withheld results',
-        'I': 'Expelled/rusticated/suspended student',
-        'J': 'Temporary withdrawn from the university',
-        'K': 'Unregistered student',
-        'L': 'Referred student',
-        'M': 'Reinstatement',
-        'N': 'Student on transfer',
-        'O': 'NCE-III repeater',
-        'Y': 'No previous verdict',
-        'X': 'New 300 level student',
-        'Z': 'Successful student (provisional)',
-        'A1': 'First Class',
-        'A2': 'Second Class Upper',
-        'A3': 'Second Class Lower',
-        'A4': 'Third Class',
-        'A5': 'Pass',
-        'A6': 'Distinction',
-        'A7': 'Credit',
-        'A8': 'Merit',
-        }
-
-    # AAUE separators
-    SEPARATORS_DICT = {
-        'form.fst_sit_fname': _(u'First Sitting Record'),
-        'form.scd_sit_fname': _(u'Second Sitting Record'),
-        'form.alr_fname': _(u'Advanced Level Record'),
-        'form.hq_type': _(u'Higher Education Record'),
-        'form.hq2_type': _(u'Second Higher Education Record'),
-        'form.nysc_year': _(u'NYSC Information'),
-        'form.employer': _(u'Employment History'),
-        'form.former_matric': _(u'Former AAUE Student'),
-        }
-
     # AAUE prefix
     STUDENT_ID_PREFIX = u'E'