Changeset 17659 for main/waeup.uniben/trunk/src

Timestamp:

22 Dec 2023, 16:47:45 (12 months ago)

Author:

Henrik Bettermann

Message:

Ticket #1328 (second part)

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• interfaces.py (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -21 +21 @@
 
 #from grok import getSite
+import re
 from zope import schema
 from zope.interface import invariant, Invalid
@@ -55 +56 @@
 from waeup.uniben.payments.interfaces import ICustomOnlinePayment
 
+
+# Define a validation method for JAMB reg numbers
+class NotMatricRegNumber(schema.ValidationError):
+    __doc__ = u"Invalid matriculation number"
+
+#: Regular expression to check matric_number formats.
+check_matric_number = re.compile(r"^[^0-9\s][^\s]*$").match
+
+def validate_matric_number(value):
+    if not check_matric_number(value):
+        raise NotMatricRegNumber(value)
+    return True
+
 class TranscriptCertificateSource(CertificateSource):
     """Include Department and Faculty in Title.
@@ -316 +330 @@
         readonly = False,
         required = True,
+        constraint = validate_matric_number,
         )
 
@@ -434 +449 @@
     dispatch_address = schema.Text(
         title = _(u'Recipient Body'),
-        description = u'Addresses (including email address and phone number) '
-                       'to which transcripts should be posted. '
+        description = u'Addresses to which transcripts should be posted. '
                        'All addresses must involve same courier charges.',
         required = True,
         readonly = False,
+        )
+
+    dispatch_email = schema.ASCIILine(
+        title = _(u'Recipient Email Address'),
+        required = False,
+        constraint=validate_email,
+        )
+
+    dispatch_phone = PhoneNumber(
+        title = _(u'Recipient Phone'),
+        description = u'',
+        required = False,
         )
 

main/waeup.uniben/trunk/src/waeup/uniben/applicants/tests/test_browser.py

@@ -336 +336 @@
         self.browser.getControl(name="form.no_copies").value = ['2']
         self.browser.getControl(name="form.course_studied").value = ['CERT1']
-        self.browser.getControl(name="form.matric_number").value = '234'
+        self.browser.getControl(name="form.matric_number").value = 'a234'
         self.browser.getControl(name="form.dispatch_address").value = 'Kuensche\nMarsch 5'
         self.browser.getControl(name="form.entry_mode").value = ['ug_ft']