Changeset 3681

Timestamp:

19 Sep 2008, 09:38:16 (16 years ago)

Author:

Henrik Bettermann

Message:

• admitOneStudent uses entry_session from applicants_catalog instead of static argument (not yet tested)

Location:

WAeUP_SRP/base

Files:

• CHANGES.txt (modified) (1 diff)
• WAeUPTool.py (modified) (2 diffs)
• skins/waeup_student/admitStudents.py (modified) (1 diff)

WAeUP_SRP/base/CHANGES.txt

@@ -21 +21 @@
   cd layouts/
   ln -s ../../../profiles_custom/default/layouts/student_course_result.xml .
+
+1.3 (2008-09-19)
+-----------------
+- admitOneStudent uses entry_session from applicants_catalog instead
+  of static argument (not yet tested)

WAeUP_SRP/base/WAeUPTool.py

@@ -970 +970 @@
         logger = logging.getLogger('WAeUPTool.admitOneStudent')
         self.with_timing = with_timing
+
+        #ignore argument entry_session
+        if not brain.entry_session:
+            logger.info('no entry_session for %s provided' % (reg_no))
+            return
+
         if not hasattr(self,"_v_certificates"):
             self._v_certificates = self.getCertificatesDict()
         students_folder = self.portal_url.getPortalObject().campus.students
         if brain.screening_type in ('cest','sandwich',):
-            reg_no = "%s%s/07" % (brain.course1[:3],brain.serial)
+            reg_no = "%s%s/%s" % (brain.course1[:3],brain.serial,brain.entry_session)
         else:
             reg_no = brain.reg_no
@@ -1029 +1035 @@
         da['entry_mode'] = self._v_certificates[brain.course_admitted]['study_mode']
 
-        da['entry_session'] = entry_session
+        #da['entry_session'] = entry_session
+        da['entry_session'] = brain.entry_session
         da['jamb_lastname'] = brain.lastname
         da['jamb_middlename'] = brain.middlenames   # different field names!

WAeUP_SRP/base/skins/waeup_student/admitStudents.py

@@ -22 +22 @@
     return
 
-entry_session = '07'
+entry_session = '07'   # is been overwritten in admitOneStudent
 pin_password = False