Changeset 2846 for WAeUP_SRP/base

Timestamp:

3 Dec 2007, 21:53:29 (17 years ago)

Author:

joachim

Message:

new level handling in mass_create_student

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1630 +1630 @@
                               )
                               },
-                         'StudentStudyLevel':
-                          {'id': 'current_level',
-                           'title': '',
-                           'wf_transition_return': 'open',
-                           'wf_transition_admit': 'remain',
-                           'fields':
-                             ('verdict',
-                              'session',
-                              )
-                              },
+                         # 'StudentStudyLevel':
+                         #  {'id': 'current_level',
+                         #   'title': '',
+                         #   'wf_transition_return': 'open',
+                         #   'wf_transition_admit': 'remain',
+                         #   'fields':
+                         #     ('verdict',
+                         #      'session',
+                         #      )
+                         #      },
                          'PaymentsFolder':
                           {'id': 'payments',
@@ -1748 +1748 @@
         #import pdb;pdb.set_trace()
         any_change = False
+        #special treatment for StudentStudyLevel
+        d['verdict']  = mapping.get('current_verdict','')
+        d['session']  = mapping.get('current_session','')
+        current_level = mapping.get('current_level','')
+        while d['session'] and d['verdict'] and current_level:
+            sub_obj = getattr(student_obj,'study_course',None)
+            if sub_obj is None:
+                break
+            level_obj = getattr(sub_obj,current_level,None)
+            if  level_obj is None:
+                break
+            any_change = True
+            level_obj.getContent().edit(mapping = d)
+            try:
+                wftool.doActionFor(level_obj,'close')
+            except:
+                pass
+            break
         for pt in f2t.keys():
             if pt == "StudentApplication":
@@ -1753 +1771 @@
                 if mapping.get('sex'):
                     d['jamb_sex']  = 'F'
-            #special treatment for StudentStudyLevel
-            elif pt == "StudentStudyLevel":
-                d['verdict']  = mapping.get('current_verdict','')
-                d['session']  = mapping.get('current_session','')
-                current_level = mapping.get('current_level','')
-                while d['session'] and d['verdict'] and current_level:
-                    sub_obj = getattr(student_obj,'study_course',None)
-                    if sub_obj is None:
-                        break
-                    level_obj = getattr(sub_obj,current_level,None)
-                    if  level_obj is None:
-                        break
-                    any_change = True
-                    level_obj.getContent().edit(mapping = d)
-                    try:
-                        wftool.doActionFor(level_obj,'close')
-                    except:
-                        pass
-                    break
             intersect = set(f2t[pt]['fields']).intersection(set(editable_keys))
             if intersect and pt not in ('StudentStudyLevel',):