Changeset 3902 for WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

Timestamp:

3 Feb 2009, 08:12:10 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve 2 and 3 of ticket Schools #7

File:

• WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -97 +97 @@
 
 complete1 = 0
+score_calc_average_1 = 0
 for r in normal1:
-   if r['grade'] and r['atl']:
-       complete1 += 1
+    if r['grade'] and r['atl']:
+        complete1 += 1
+        score_calc_average_1 += r['score_calc']
 if len(normal1) == complete1:
     complete1 =  True
 else:
     complete1 = False
+if len(normal1):
+    score_calc_average_1 /= len(normal1)    
 info['complete1'] = complete1     
+info['score_calc_average_1'] = score_calc_average_1  
 
 complete2 = 0
+score_calc_average_2 = 0
 for r in normal1:
-   if r['grade'] and r['atl']:
-       complete2 += 1
+    if r['grade'] and r['atl']:
+        score_calc_average_2 += r['score_calc']
+        complete2 += 1
 if len(normal2) == complete2:
     complete2 =  True
 else:
     complete2 = False
+if len(normal2):
+    score_calc_average_2 /= len(normal2)
 info['complete2'] = complete2
+info['score_calc_average_2'] = score_calc_average_2  
 
 complete3 = 0
+score_calc_average_3 = 0
 for r in normal1:
-   if r['grade'] and r['atl']:
-       complete3 += 1
+    if r['grade'] and r['atl']:
+        complete3 += 1
+        score_calc_average_3 += r['score_calc']
 if len(normal3) == complete3:
     complete3 =  True
 else:
     complete3 = False
+if len(normal3):
+    score_calc_average_3 /= len(normal3)    
 info['complete3'] = complete3
+info['score_calc_average_3'] = score_calc_average_3