Changeset 2456 for WAeUP_SRP/base/skins/cps_custom

Timestamp:

28 Oct 2007, 07:09:46 (17 years ago)

Author:

Henrik Bettermann

Message:

mark deprecated vocabulary
use '000' for pre-studies (no longer missing value)
improve fixReturningSession.py (do not replace level by '000')
fix getNextInfo.py
fix logged_in.py

File:

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

WAeUP_SRP/base/skins/cps_custom/logged_in.py

@@ -203 +203 @@
         verdict = res[0].verdict
         level = res[0].level
-        has_level = level and not level == '000' 
-        has_verdict = verdict and not verdict == 'N/A' 
+        has_level = level and not level == '000'
+        has_verdict = verdict and not verdict == 'N/A'
         #set_trace()
 
@@ -212 +212 @@
 
         #########################################################
-        
+
         # 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 s_review_state in ('returning','school_fee_paid') and not (has_verdict and has_level):
             if has_results:
                 study_course = getattr(student,'study_course')
@@ -224 +224 @@
                 if not has_level and s_review_state == 'returning':
                     lnr = context.getLevelFromResultsCosCode(has_results)
-                    dsc['current_level'] = "%d00" % lnr                    
+                    dsc['current_level'] = "%d00" % lnr
                 if sc_review_state != 'opened':
                     wftool.doActionFor(study_course,'open')