Changeset 3036 for WAeUP_SRP/base

Timestamp:

23 Jan 2008, 10:02:33 (17 years ago)

Author:

joachim

Message:

fix mass_edit_verdict, add wf-transition

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (4 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1936 +1936 @@
             if matric_no and student_record.matric_no and\
               matric_no != student_record.matric_no:
-                logger.info("%s, old matric_no %s overwritten with %s" % (student_record.id,student_record.matric_no,matric_no))
+                return '', 'student %s matric_no %s does not match %s' % (student_record.id,
+                                                                          student_record.matric_no,
+                                                                          matric_no)
         elif matric_no:
             res = self.students_catalog(matric_no = matric_no)
@@ -1946 +1948 @@
         student_id = student_record.id
         student_review_state =  student_record.review_state
-        if student_review_state not in ('courses_validated',):
+        if student_review_state not in ('courses_validated','returning'):
             return '',"student %s in wrong review_state %s" % (student_id, student_review_state)
         student_obj = getattr(students_folder,student_id)
@@ -1965 +1967 @@
                                                                                     current_level,
                                                                                     student_record.level)
-        sub_obj = getattr(student_obj,'study_course',None)
-        if sub_obj is None:
+        study_course_obj = getattr(student_obj,'study_course',None)
+        if study_course_obj is None:
             return '','student_id %s: no study_course-object' % student_id
-        level_obj = getattr(sub_obj,current_level,None)
+        level_obj = getattr(study_course_obj,current_level,None)
         if  level_obj is None:
             return '','student_id %s: no study_level-object for level %s' % (student_id,
                                                                              current_level)
-        verdict = d['verdict']  = mapping.get('current_verdict','')
+        verdict = d['verdict'] = d['current_verdict']  = mapping.get('current_verdict','')
         if verdict == student_record.verdict:
             return '','student_id %s: verdict already set to %s' % (student_id,
@@ -1982 +1984 @@
                                                                  current_level)
         
+        study_course_obj.getContent().edit(mapping = d)
         level_obj.getContent().edit(mapping = d)
+        if student_review_state != "returning":
+            wftool.doActionFor(student_obj,'return')
         try:
             wftool.doActionFor(level_obj,'close')