Changeset 2447 for WAeUP_SRP/base

Timestamp:

27 Oct 2007, 10:59:51 (17 years ago)

Author:

Henrik Bettermann

Message:

reload verdict and level

File:

• WAeUP_SRP/base/skins/cps_custom/logged_in.py (modified) (4 diffs)

WAeUP_SRP/base/skins/cps_custom/logged_in.py

@@ -65 +65 @@
         elif student_app is None:
             context.waeup_tool.makeStudentData(str(member))
-            
+
         #########################################################
 
@@ -129 +129 @@
         # look for passport pictures of new students
 
-        if s_review_state in ('admitted', 
-                              'clearance_pin_entered', 
+        if s_review_state in ('admitted',
+                              'clearance_pin_entered',
                               'clearance_requested'
                              )  and not context.waeup_tool.picturesExist(('passport',),
@@ -202 +202 @@
         matric_no = res[0].matric_no
         verdict = res[0].verdict
-
-        #########################################################
-
-        # fetch current verdict via getVerdict
-
-        if s_review_state in ('returning','school_fee_paid') and not verdict:
-            results = context.results_import(matric_no = matric_no)
-            if results:
+        level = res[0].level
+        has_level = level and not level == '000' 
+        has_verdict = verdict and not verdict == 'N/A' 
+        #set_trace()
+
+        #########################################################
+
+        has_results = context.results_import(matric_no = matric_no)
+
+        #########################################################
+        
+        # fetch current verdict via getVerdict and level via getLevelFromResultsCosCode
+
+        if s_review_state in ('returning','school_fee_paid') and not (has_verdict or has_level):
+            if has_results:
                 study_course = getattr(student,'study_course')
                 sc_review_state = wftool.getInfoFor(study_course,'review_state',None)
                 dsc = {}
-                dsc['current_verdict'] = context.getVerdict(results[0].Verdict)[0]
+                if not has_verdict:
+                    dsc['current_verdict'] = context.getVerdict(has_results[0].Verdict)[0]
+                if not has_level and s_review_state == 'returning':
+                    lnr = context.getLevelFromResultsCosCode(has_results)
+                    dsc['current_level'] = "%d00" % lnr                    
                 if sc_review_state != 'opened':
                     wftool.doActionFor(study_course,'open')
@@ -222 +233 @@
         #########################################################
 
-        has_results = context.results_import(matric_no = matric_no)
-
-        #########################################################
 
         # determine appropriate redirect url