Changeset 7344 for main

Timestamp:

14 Dec 2011, 14:06:24 (13 years ago)

Author:

Henrik Bettermann

Message:

This my recent version of the createStudent method.

Location:

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

Files:

• applicants/applicant.py (modified) (3 diffs)
• applicants/dynamicroles.py (deleted)
• applicants/tests/test_dynamicroles.py (deleted)
• students/browser.py (modified) (1 diff)

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

@@ -80 +80 @@
 
     def createStudent(self):
-        """Create a student object based on the applicant base data
-        and copy applicant object.
-        """
+        """Create a student, fill with base data, create a StudentApplication
+        object and copy applicant data.
+        """
+        # Is applicant in the correct state?
+        if self.state != 'admitted':
+            return False, "Applicant has not yet been admitted."
+        # Does registration number exist?
         student = createObject(u'waeup.Student')
-        # Check first if registration number exists
         try:
             student.reg_number = self.reg_number
         except RegNumNotInSource:
             return False, 'Registration Number exists.'
-        catalog = getUtility(ICatalog, name='certificates_catalog')
-        #import pdb; pdb.set_trace()
-        code = self.course_admitted['code']
+        # Has the course_admitted field been properly filled?
+        code = self.course_admitted.get('code')
         if code:
+            catalog = getUtility(ICatalog, name='certificates_catalog')
             cert = [i for i in catalog.searchResults(code=(code,code))][0]
         else:
             return False, 'No course admitted provided.'
+        # Add student object
         site = grok.getSite()
         site['students'].addStudent(student)
+        # Fill student_id
+        self.student_id = student.student_id
+        # Fire transition 'create'
+        IWorkflowInfo(self).fireTransition('create')
+
         # TODO: Split fullname in students package and copy first,
-        # middle and lastaname
-        
+        # middle and lastname
+
+        # Copy some base data
         student.fullname = self.fullname
         student.sex = self.sex
@@ -106 +116 @@
         student.email = self.email
         student.phone = self.phone
+        # Save the certificate
         student['studycourse'].certificate = cert
+        # Create StudentApplication object ...
+        application = createObject(u'waeup.StudentApplication')
+        # ... copy applicant base data
         form_fields = grok.AutoFields(IApplicantBaseData)
         field_names = [i.__name__ for i in form_fields]
-        application = createObject(u'waeup.StudentApplication')
         for name in field_names:
             value = getattr(self,name,None)
@@ -115 +128 @@
                 setattr(application,name,value)
         site['students'][student.student_id]['application'] = application
-        return True, 'Student with Id %s created' % student.student_id
+        return True, 'Student %s created' % student.student_id
 
 # Set all attributes of Applicant required in IApplicant as field

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -483 +483 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IApplicantBaseData)
+    form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     title = 'Application Data'
     pnav = 4