Changeset 2483

Timestamp:

30 Oct 2007, 20:29:47 (17 years ago)

Author:

Henrik Bettermann

Message:

don't fetch verdict from results_import if school_fee_paid

Location:

WAeUP_SRP/base/skins

Files:

• cps_custom/logged_in.py (modified) (2 diffs)
• waeup_student/getStudyCourseInfo.py (modified) (3 diffs)

WAeUP_SRP/base/skins/cps_custom/logged_in.py

@@ -69 +69 @@
 
         student_app = getattr(student,'application',None)
-            
+
         #########################################################
 
@@ -223 +223 @@
                 sc_review_state = wftool.getInfoFor(study_course,'review_state',None)
                 dsc = {}
-                if not has_verdict:
+                if not has_verdict and s_review_state == 'returning':
                     dsc['current_verdict'] = context.getVerdict(has_results[0].Verdict)[0]
                 if not has_level and s_review_state == 'returning':

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -60 +60 @@
 
 items = []
+
+if hasattr(course,'current_verdict'):
+    try:
+        info['verdict'] = context.portal_vocabularies.verdicts.get(course.current_verdict).upper()
+    except:
+        info['verdict'] = course.current_verdict
+else:
+    info['verdict'] = ''
+
+if hasattr(course,'previous_verdict'):
+    try:
+        previous_verdict = course.previous_verdict
+        info['previous_verdict'] = context.portal_vocabularies.verdicts.get(course.previous_verdict).upper()
+    except:
+        info['previous_verdict'] = course.previous_verdict
+else:
+    info['previous_verdict'] = ''
+    previous_verdict = ''
+
+
 current_level = sbrain.level
 levels = context.objectIds()
@@ -68 +88 @@
 may_register = (student_review_state in ('school_fee_paid',)) and\
                current_level not in levels and\
-               (sbrain.verdict in ('A','B','C','F','J','L','M') or sbrain.level == '100' or (sbrain.mode.startswith('de') and sbrain.level == '200'))
+               (previous_verdict in ('A','B','C','F','J','L','M') or sbrain.level == '100' or (sbrain.mode.startswith('de') and sbrain.level == '200'))
 
 levels.sort()
@@ -84 +104 @@
 info['items'] = items
 
-if hasattr(course,'current_verdict'):
-    try:
-        info['verdict'] = context.portal_vocabularies.verdicts.get(course.current_verdict).upper()
-    except:
-        info['verdict'] = course.current_verdict
-else:
-    info['verdict'] = ''   
-     
-if hasattr(course,'previous_verdict'):        
-    try:
-        info['previous_verdict'] = context.portal_vocabularies.verdicts.get(course.previous_verdict).upper()
-    except:
-        info['previous_verdict'] = course.previous_verdict
-else:
-    info['previous_verdict'] = ''
-    
+
+
 return info