Changeset 5513

Timestamp:

7 Sep 2010, 20:49:28 (14 years ago)

Author:

Henrik Bettermann

Message:

do not require study_level object for verdict imports

File:

• WAeUP_SRP/trunk/WAeUPImport.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPImport.py

@@ -1462 +1462 @@
                 msg = 'student %s: no study_course object' % student_id
                 break
+            verdict = d['verdict'] = d['current_verdict']  = mapping.get('current_verdict','')
+
             level_obj = getattr(study_course_obj,current_level,None)
             if  level_obj is None:
-                msg = 'student %s: no study_level object for level %s' % (student_id,
-                                                                                current_level)
-                break
-            verdict = d['verdict'] = d['current_verdict']  = mapping.get('current_verdict','')
-
-            #if verdict == student_record.verdict:
-            #    msg = 'student %s: verdict already set to %s' % (student_id,
-            #                                                            verdict)
-
-            level_review_state = wftool.getInfoFor(level_obj,'review_state',None)
-            if level_review_state != "closed":
-                #wftool.doActionFor(level_obj,'close')
-                self.waeup_tool.changeWorkflowState(level_obj, 'closed')
-                # msg = 'student %s: level %s is not closed' % (student_id,
-                #                                                      current_level)
-
-            study_course_obj.getContent().edit(mapping = d)
-            level_obj.getContent().edit(mapping = d)
+                #msg = 'student %s: no study_level object for level %s' % (student_id,current_level)
+                #break
+                level_review_state = wftool.getInfoFor(level_obj,'review_state',None)
+                if level_review_state != "closed":
+                    self.waeup_tool.changeWorkflowState(level_obj, 'closed')
+                level_obj.getContent().edit(mapping = d)
+            study_course_obj.getContent().edit(mapping = d)            
             if student_review_state != "returning":
-                #wftool.doActionFor(student_obj,'return')
                 self.waeup_tool.changeStudentState(student_obj, 'returning')
-            # try:
-            #     wftool.doActionFor(level_obj,'close')
-            # except:
-            #     pass
             break
         return student_id,msg,mapping