Changeset 3146

Timestamp:

12 Feb 2008, 10:35:28 (17 years ago)

Author:

Henrik Bettermann

Message:

resolve #90fc

File:

• WAeUP_SRP/base/Students.py (modified) (2 diffs)

WAeUP_SRP/base/Students.py

@@ -176 +176 @@
                 total_not_imported += 1
                 continue
+            if res.review_state in ('courses_registered','courses_validated'):
+                em = 'already registered course list'
+                logger.info('%s (%s) %s' % (student_brain.id, old_matric_no, em))
+                result['Error'] = em
+                not_imported.append( format_error % result)
+                total_not_imported += 1
+                continue                
             student_brain = res[0]
             student_object = getattr(students_folder,student_brain.id)
@@ -229 +236 @@
             except:
                 pass
-            if study_course.objectIds():
-                em = 'Already registered level %s for %s, but is supposed to study %s at level %s' % (old_current_level,old_study_course,new_study_course,current_level)
-                logger.info('%s (%s) %s' % (student_brain.id, old_matric_no, em))
-                result['Error'] = em
-                not_imported.append( format_error % result)
-                total_not_imported += 1
-                continue
+
             #from pdb import set_trace; set_trace()
             cd = {}