Changeset 2727

Timestamp:

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

Author:

joachim

Message:

fix for #411

Location:

WAeUP_SRP

Files:

• base/WAeUPTool.py (modified) (2 diffs)
• base/skins/waeup_academics/getCertificatesVoc.py (added)
• base/skins/waeup_academics/get_departments_voc.py (deleted)
• base/skins/waeup_academics/get_faculties_voc.py (deleted)
• base/skins/waeup_student/admitStudents.py (modified) (2 diffs)
• uniben/profiles/default/vocabularies.xml (modified) (2 diffs)
• uniben/profiles/default/vocabularies/get_certificates_voc.xml (added)
• uniben/profiles/default/vocabularies/get_departments_voc.xml (modified) (1 diff)
• uniben/profiles/default/vocabularies/get_faculties_voc.xml (modified) (1 diff)

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)

WAeUP_SRP/uniben/profiles/default/vocabularies.xml

@@ -17 +17 @@
  <object name="get_departments_voc" meta_type="CPS Method Vocabulary"/>
  <object name="get_faculties_voc" meta_type="CPS Method Vocabulary"/>
+ <object name="get_certificates_voc" meta_type="CPS Method Vocabulary"/>
  <object name="groups_voc" meta_type="CPS Method Vocabulary"/>
  <object name="waeup_bed_letters" meta_type="CPS Vocabulary"/>
@@ -28 +29 @@
  <object name="religion" meta_type="CPS Vocabulary"/>
  <object name="sessions" meta_type="CPS Method Vocabulary"/>
+ <object name="payment_types" meta_type="CPS Vocabulary"/>
+ <object name="payment_status" meta_type="CPS Vocabulary"/>
  <object name="exam_types" meta_type="CPS Vocabulary"/>
  <object name="pin_prefixes" meta_type="CPS Vocabulary"/>

WAeUP_SRP/uniben/profiles/default/vocabularies/get_departments_voc.xml

@@ -5 +5 @@
  <property name="title_msgid"></property>
  <property name="description"></property>
- <property name="get_vocabulary_method">get_departments_voc</property>
+ <property name="get_vocabulary_method">getDepartmentsVoc</property>
  <property name="add_empty_key">False</property>
  <property name="empty_key_pos">first</property>

WAeUP_SRP/uniben/profiles/default/vocabularies/get_faculties_voc.xml

@@ -5 +5 @@
  <property name="title_msgid"></property>
  <property name="description"></property>
- <property name="get_vocabulary_method">get_faculties_voc</property>
+ <property name="get_vocabulary_method">getFacultiesVoc</property>
  <property name="add_empty_key">False</property>
  <property name="empty_key_pos">first</property>