Changeset 15045 for main/kofacustom.nigeria/trunk/src

Timestamp:

11 Jun 2018, 07:29:33 (7 years ago)

Author:

Henrik Bettermann

Message:

Add validation expression for JAMB registration numbers.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria

Files:

• applicants/interfaces.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)
• students/tests/test_export.py (modified) (3 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/interfaces.py

@@ -37 +37 @@
 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
 from kofacustom.nigeria.interfaces import (
-    LGASource, high_qual, high_grade, exam_types)
+    LGASource, high_qual, high_grade, exam_types, validate_jamb_reg_number)
 from kofacustom.nigeria.interfaces import MessageFactory as _
 from kofacustom.nigeria.payments.interfaces import INigeriaOnlinePayment
@@ -357 +357 @@
         title = _(u'JAMB Registration Number'),
         required = False,
+        constraint=validate_jamb_reg_number,
         )
     notice = schema.Text(

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interfaces.py

@@ -17 +17 @@
 ##
 
+import re
 import zope.i18nmessageid
 from zope import schema
@@ -76 +77 @@
     )
 
+# Define a validation method for JAMB reg numbers 
+class NotJAMBRegNumber(schema.ValidationError):
+    __doc__ = u"Invalid JAMB registration number"
+
+#: Regular expression to check jamb_reg_number formats.
+check_jamb_reg_number = re.compile(r"^[A-Z]{2}\d{8}$").match
+
+def validate_jamb_reg_number(value):
+    if not check_jamb_reg_number(value):
+        raise NotJAMBRegNumber(value)
+    return True
+
 #lgas_vocab = SimpleKofaVocabulary(
 #    *sorted([(x[1],x[0]) for x in LGAS]))

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

@@ -29 +29 @@
 from kofacustom.nigeria.testing import FunctionalLayer
 
+curr_year = datetime.datetime.now().year
 
 class NigeriaStudentExporterTest(StudentImportExportSetup):
@@ -115 +116 @@
         # set values we can expect in export file
         self.setup_student(self.student)
-        self.student['payments']['my-payment'].r_company = 'interswatch'
+        self.student['payments']['my-payment'].r_company = 'interswitch'
         self.student['payments']['my-payment'].r_card_num = '789'
         exporter = NigeriaStudentPaymentExporter()
@@ -127 +128 @@
             'current_session\r\n'
             '666,12.12,2012-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
-            '100,2011,paid,2012-04-01 14:12:01#,,12.12,'
-            '789,r-code,interswatch,,,,A111111,created,2012\r\n',
+            '100,%s,paid,2012-04-01 14:12:01#,,12.12,'
+            '789,r-code,interswitch,,,,A111111,created,2012\r\n' % (curr_year-6),
             result
             )