Changeset 2727 for WAeUP_SRP/base

Timestamp:

21 Nov 2007, 14:12:30 (17 years ago)

Author:

joachim

Message:

fix for #411

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (2 diffs)
• skins/waeup_academics/getCertificatesVoc.py (added)
• skins/waeup_academics/get_departments_voc.py (deleted)
• skins/waeup_academics/get_faculties_voc.py (deleted)
• skins/waeup_student/admitStudents.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -757 +757 @@
         "create Datastructure for an admitted Student"
         #import pdb;pdb.set_trace()
+        if not hasattr(self,"_v_certificates"):
+            self._v_certificates = [entry[0] for entry in self.getCertificatesVoc()]
         students_folder = self.portal_url.getPortalObject().campus.students
         logger = logging.getLogger('WAeUPTool.admitOneStudent')
@@ -765 +767 @@
         if len(pin_parts) != 3:
             logger.info('invalid pin %s for %s' % (brain.pin,brain.reg_no))
+            return
+        if brain.course_admitted not in self._v_certificates:
+            logger.info('certificate %s not found for %s' % (brain.course_admitted,brain.reg_no))
             return
         student_id = self.generateStudentId('?')

WAeUP_SRP/base/skins/waeup_student/admitStudents.py

@@ -52 +52 @@
         context.waeup_tool.doCommit()
         logger.info("Committing %s transactions, total %s" % (commit_after,count))
-        #cocount += 1
-        #if cocount > 1:
-        #    break
+        # cocount += 1
+        # if cocount > 1:
+        #     break
     brain = aq_applicants(Eq('reg_no',reg_no))[0]
     #logger.info("start creating  objects of student %s" % (brain.reg_no))
@@ -64 +64 @@
         admitted += 1
     else:
-        logger.info("could not create objects of student %s with pin " % (reg_no,brain.pin))
+        logger.info("could not create objects of student %s with pin %s" % (reg_no,brain.pin))
 
 msg = "finished admitting %d students" % (admitted)