Changeset 1816

Timestamp:

24 May 2007, 05:49:27 (18 years ago)

Author:

Henrik Bettermann

Message:

• importResults fixed: line readded which had been removed in revion 1700 (don't know why!!)
• also the link 'Previous Sessions' now works for withdrawn students

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (2 diffs)
• WAeUPTool.py (modified) (1 diff)
• skins/waeup_student/getStudyCourseInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -394 +394 @@
             dsc = {}
             catalog_entry['level'] = dsc['current_level'] = entry_levels.get(da['entry_mode'],'100')
-            #catalog_entry['level'] = dsc['current_level'] = '100'  # Attention: not for DE students            
+            #catalog_entry['level'] = dsc['current_level'] = '100'  # Attention: not for DE students
             catalog_entry['session'] = dsc['current_session'] = da['entry_session']
             catalog_entry['mode'] = dsc['current_mode'] = da['entry_mode']
@@ -769 +769 @@
                     #result['Error'] = "No Course"
                     #logger.info(format_error % result)
+                    
+            result['key'] = key
+            try:
+                table.addRecord(**result)
+            except ValueError:
+                #import pdb;pdb.set_trace()
+                result['Error'] = "Duplicate"
+                no_import.append( format_error % result)
+                continue
+                    
             regs.append(key)
             imported.append(format % result)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -291 +291 @@
             student = res[0]
         else:
-            logger.info('%s Id not found in returning_import' % student_id)
+            logger.info('Id %s not found in returning_import' % student_id)
             return
         logger.info('%s creates data structure' % student_id)
         s_results = self.results_import(matric_no = student.matric_no)
-        lnr = self.getLevelFromResultsCosCode(s_results)
-        level = "%d00" % lnr
-        verdict,eligible = self.getVerdict(s_results[0].Verdict)
-        if eligible:
-            level = "%d00" % (lnr + 1)
-##        level = s_results[0].Level
-##        for result in s_results:
-##            if level != result.Level:
-##                logger.info('"%s", "Levels differ","%s != %s"' % (student_id,level,result.Level))
+        if s_results:
+            lnr = self.getLevelFromResultsCosCode(s_results)
+            level = "%d00" % lnr
+            verdict,eligible = self.getVerdict(s_results[0].Verdict)
+            if eligible:
+                level = "%d00" % (lnr + 1)
+        else:
+            logger.info('matric_no %s not found in results_import' % student.matric_no)
+            level = 0
+            verdict = 'N/A'
         #student should not be allowed to perform this transition
         #wftool = self.portal_workflow

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -52 +52 @@
     info['course_doc'] = ci
 else:
-    info['course'] = None
+    info['cert_id'] = 'N/A'
+    ci['study_course'] = 'N/A'
+    ci['title'] = 'N/A'
+    ci['faculty'] = 'N/A'
+    ci['department'] = 'N/A'
+    info['course_doc'] = ci
+    
 items = []
 current_level = sbrain.level