Changeset 8668

Timestamp:

11 Jun 2012, 06:42:14 (12 years ago)

Author:

Henrik Bettermann

Message:

Copy also customized fields from applicant to student.

Fix typos.

Location:

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

Files:

• applicant.py (modified) (1 diff)
• browser.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests.py (modified) (5 diffs)

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

@@ -30 +30 @@
     grok.provides(ICustomApplicant)
 
+    create_names = Applicant.create_names + [
+        'lga', 'nationality', 'perm_address']
+
 # Set all attributes of Applicant required in IApplicant as field
 # properties. Doing this, we do not have to set initial attributes

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

@@ -192 +192 @@
 
     def _redirect(self, email, password, applicant_id):
-        # Forward only email and credentials to landing page.
+        # Forward email and credentials to landing page.
         self.redirect(self.url(self.context, 'registration_complete',
             data = dict(email=email, password=password,

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

@@ -312 +312 @@
 
     def createStudent():
-        """Create a student object from applicatnt data
+        """Create a student object from applicant data
         and copy applicant object.
         """

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

@@ -29 +29 @@
 from zope.catalog.interfaces import ICatalog
 from zope.testbrowser.testing import Browser
+from hurry.workflow.interfaces import IWorkflowState
 from waeup.kofa.app import University
 from waeup.kofa.university.faculty import Faculty
@@ -93 +94 @@
         self.certificate.start_level = 100
         self.certificate.end_level = 500
+        self.certificate.study_mode = u'ug_ft'
         self.app['faculties']['fac1'] = Faculty()
         self.app['faculties']['fac1']['dep1'] = Department()
@@ -102 +104 @@
         self.certificate2.start_level = 100
         self.certificate2.end_level = 500
+        self.certificate.study_mode = u'pg_ft'
         self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
             self.certificate2)
@@ -141 +144 @@
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
         self.browser.getControl(name="form.lga").value = ['foreigner']
+        self.browser.getControl(name="form.nationality").value = ['NG']
         self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
@@ -252 +256 @@
             reg_number=(applicant.reg_number, applicant.reg_number)))
         self.assertEqual(applicant,results[0])
+        return
+
+    def test_create_ugstudent(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        manage_path = 'http://localhost/app/applicants/%s/%s/%s' % (
+            'app2011', self.ugapplicant.application_number, 'manage')
+        self.browser.open(manage_path)
+        self.fill_correct_values()
+        self.browser.getControl("Save").click()
+        IWorkflowState(self.ugapplicant).setState('admitted')
+        self.browser.getControl(name="form.course1").value = ['CERT1']
+        self.browser.getControl(name="form.course_admitted").value = ['CERT1']
+        self.browser.getControl("Save").click()
+        self.browser.getLink("Create student").click()
+        student_id =  self.app['students'].keys()[0]
+        self.assertTrue(('Student %s created' % student_id)
+            in self.browser.contents)
+        student = self.app['students'][student_id]
+        self.assertEqual(student.email, 'xx@yy.zz')
+        self.assertEqual(student.firstname, 'John')
+        self.assertEqual(student.lastname, 'Tester')
+        # Also additional attributes have been copied.
+        self.assertEqual(student.lga, 'foreigner')
+        self.assertEqual(student.nationality, 'NG')
         return