Changeset 7338 for main

Timestamp:

13 Dec 2011, 17:26:35 (13 years ago)

Author:

Henrik Bettermann

Message:

Start implementation of applicant copier.

Reorganize interfaces in the applicants package. We need a base interface which can be used in the students package too, for storing the application data. The upcoming StudentApplication? class has to implement the IApplicantBaseData interface. So, data fields have to be isolated.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• applicant.py (modified) (2 diffs)
• interfaces.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py

@@ -20 +20 @@
 from grok import index
 from zope.component.interfaces import IFactory
+from zope.component import createObject
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.interface import implementedBy
@@ -75 +76 @@
         else:
             return '%s %s' % (self.firstname, self.lastname)
+
+    def createStudent(self):
+        """Create a student object from applicatnt data
+        and copy applicant object.
+        """
+        student = createObject(u'waeup.Student')
+        site = grok.getSite()
+
+        site['students'].addStudent(student)
+        student.fullname = self.fullname
+        return student.student_id
 
 # Set all attributes of Applicant required in IApplicant as field

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

@@ -282 +282 @@
     the derived interfaces below, which set more fields to required
     state, depending on use-case.
-    """
+
+    This base interface is also implemented by the StudentApplication
+    class in the students package. Thus, these are the data which are saved
+    after admission.
+    """
+
+    applicant_id = schema.TextLine(
+        title = u'Applicant Id',
+        required = False,
+        readonly = False,
+        )
+    reg_number = TextLineChoice(
+        title = u'JAMB Registration Number',
+        readonly = False,
+        required = True,
+        default = None,
+        source = contextual_reg_num_source,
+        )
+    access_code = schema.TextLine(
+        title = u'Access Code',
+        required = False,
+        readonly = True,
+        )
+    firstname = schema.TextLine(
+        title = u'First Name',
+        required = True,
+        )
+    middlenames = schema.TextLine(
+        title = u'Middle Names',
+        required = False,
+        )
+    lastname = schema.TextLine(
+        title = u'Last Name (Surname)',
+        required = True,
+        )
+    date_of_birth = schema.Date(
+        title = u'Date of Birth',
+        required = True,
+        )
+    lga = schema.Choice(
+        source = lgas_vocab,
+        title = u'State/LGA',
+        default = 'foreigner',
+        required = True,
+        )
+    sex = schema.Choice(
+        title = u'Sex',
+        source = GenderSource(),
+        default = u'm',
+        required = True,
+        )
+    email = schema.ASCIILine(
+        title = u'Email',
+        required = True,
+        constraint=validate_email,
+        )
+    phone = schema.TextLine(
+        title = u'Phone',
+        description = u'',
+        required = False,
+        )
+    course1 = schema.Choice(
+        title = u'1st Choice Course of Study',
+        source = CertificateSource(),
+        required = True,
+        )
+    course2 = schema.Choice(
+        title = u'2nd Choice Course of Study',
+        source = CertificateSource(),
+        required = False,
+        )
+
+    #
+    # Data to be imported after screening
+    #
+    screening_score = schema.Int(
+        title = u'Screening Score',
+        required = False,
+        )
+    screening_venue = schema.TextLine(
+        title = u'Screening Venue',
+        required = False,
+        )
+    course_admitted = schema.Choice(
+        title = u'Admitted Course of Study',
+        source = CertificateSource(),
+        default = None,
+        required = False,
+        )
+    notice = schema.Text(
+        title = u'Notice',
+        required = False,
+        )
+
+class IApplicantProcessData(IApplicantBaseData):
+    """An applicant.
+
+    Here we add process attributes and methods to the base data.
+    """
+
     history = Attribute('Object history, a list of messages.')
     state = Attribute('The application state of an applicant')
@@ -294 +393 @@
         """
 
-    applicant_id = schema.TextLine(
-        title = u'Applicant Id',
-        required = False,
-        readonly = False,
-        )
-    reg_number = TextLineChoice(
-        title = u'JAMB Registration Number',
-        readonly = False,
-        required = True,
-        default = None,
-        source = contextual_reg_num_source,
-        )
-    access_code = schema.TextLine(
-        title = u'Access Code',
-        required = False,
-        readonly = True,
-        )
-    firstname = schema.TextLine(
-        title = u'First Name',
-        required = True,
-        )
-    middlenames = schema.TextLine(
-        title = u'Middle Names',
-        required = False,
-        )
-    lastname = schema.TextLine(
-        title = u'Last Name (Surname)',
-        required = True,
-        )
-    date_of_birth = schema.Date(
-        title = u'Date of Birth',
-        required = True,
-        )
-    lga = schema.Choice(
-        source = lgas_vocab,
-        title = u'State/LGA',
-        default = 'foreigner',
-        required = True,
-        )
-    sex = schema.Choice(
-        title = u'Sex',
-        source = GenderSource(),
-        default = u'm',
-        required = True,
-        )
-    email = schema.ASCIILine(
-        title = u'Email',
-        required = True,
-        constraint=validate_email,
-        )
-    phone = schema.TextLine(
-        title = u'Phone',
-        description = u'',
-        required = False,
-        )
-    course1 = schema.Choice(
-        title = u'1st Choice Course of Study',
-        source = CertificateSource(),
-        required = True,
-        )
-    course2 = schema.Choice(
-        title = u'2nd Choice Course of Study',
-        source = CertificateSource(),
-        required = False,
-        )
-
-    #
-    # Process Data
-    #
-    screening_score = schema.Int(
-        title = u'Screening Score',
-        required = False,
-        )
-    screening_venue = schema.TextLine(
-        title = u'Screening Venue',
-        required = False,
-        )
-    course_admitted = schema.Choice(
-        title = u'Admitted Course of Study',
-        source = CertificateSource(),
-        default = None,
-        required = False,
-        )
-    notice = schema.Text(
-        title = u'Notice',
-        required = False,
-        )
     student_id = schema.TextLine(
         title = u'Student Id',
@@ -391 +403 @@
         )
 
-class IApplicant(IApplicantBaseData):
+class IApplicant(IApplicantProcessData):
     """An applicant.
 
@@ -399 +411 @@
     """
 
-class IApplicantEdit(IApplicantBaseData):
+class IApplicantEdit(IApplicantProcessData):
     """An applicant.
 
@@ -443 +455 @@
         readonly = True,
         )
+
+    def createStudent():
+        """Create a student object from applicatnt data
+        and copy applicant object.
+        """
 
 class IApplicantUpdateByRegNo(IApplicant):