Changeset 1794

Timestamp:

17 May 2007, 16:40:34 (18 years ago)

Author:

Henrik Bettermann

Message:

ticket #211

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (1 diff)
• skins/waeup_student/display_session_results.py (modified) (1 diff)
• skins/waeup_student/set_access_data.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -283 +283 @@
         logger = logging.getLogger('WAeUPTool.makeStudentData')
         students_folder = self.portal_url.getPortalObject().campus.students
-        res = self.students_catalog(id=student_id)
-        if res:
-            st = res[0]
-        res = self.returning_import(matric_no = st.matric_no)
+        #res = self.students_catalog(id=student_id)
+        #if res:
+        #    st = res[0]
+        #res = self.returning_import(matric_no = st.matric_no)
+        res = self.returning_import(id = student_id)        
         if res:
             student = res[0]
+        else:
+            logger.info('%s Id not found in returning_import' % student_id)
+            return
         logger.info('%s creates data structure' % student_id)
-        s_results = self.results_import(matric_no = st.matric_no)
+        s_results = self.results_import(matric_no = student.matric_no)
         lnr = self.getLevelFromResultsCosCode(s_results)
         level = "%d00" % lnr

WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py

@@ -78 +78 @@
 student['session'] = session
 registered = None
-res = context.students_catalog(matric_no = student_rec.matric_no)
+res = context.returning_import(matric_no = student_rec.matric_no)
 if res:
     student_id = res[0].id

WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py

@@ -21 +21 @@
     sid = st_res[0].id
 else:
-    logger.info('Student object with matric_no does not exist' % matric_no)
+    st_res = context.returning_import(matric_no = matric_no)
+    if st_res:
+        sid = st_res[0].id
+        logger.info('Student object with matric_no %s does not exist in students_catalog. Id taken from returning_import.' % matric_no)
+    else:
+        logger.info('Student object with matric_no %s neither exists in students_catalog nor in returning_import.' % matric_no)
+        return
 res,psm,ds = lt.renderLayout(layout_id= 'student_session_results_search',
                       schema_id= 'student_returning',