Changeset 5415

Timestamp:

10 Aug 2010, 11:54:40 (14 years ago)

Author:

Henrik Bettermann

Message:

Ignore terms with no results when calculating student's year average (score_calc_average_cum) (see schools #17).

File:

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

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -144 +144 @@
 info['score_calc_average_3'] =  '%.2f' % score_calc_average_3  
 
-score_calc_average_cum = (score_calc_average_1 + score_calc_average_2 + score_calc_average_3)/3 
+terms_completed = bool(score_calc_average_1) + bool(score_calc_average_2) + bool(score_calc_average_3)
+
+if terms_completed:
+    score_calc_average_cum = (score_calc_average_1 + score_calc_average_2 + score_calc_average_3)/terms_completed
+else:
+    score_calc_average_cum = 0 
 
 info['score_calc_average_cum'] = '%.2f' % score_calc_average_cum