Changeset 724 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

19 Oct 2006, 20:39:29 (18 years ago)

Author:

Henrik Bettermann

Message:

GPA calculation corrected

File:

• WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -20 +20 @@
     course = res[0].getObject().getContent()
     return course
-        
+
 def calculateGPA():
     """calculate the gpa"""
@@ -58 +58 @@
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
-study_course = context.aq_parent.getContent()  
+study_course = context.aq_parent.getContent()
 cert_id = study_course.study_course
 brain = context.portal_catalog(meta_type="Student",id = student_id)[-1]
@@ -65 +65 @@
 info['cert_id'] = cert_id
 
-res = context.portal_catalog(meta_type="StudentCourseResult", 
+res = context.portal_catalog(meta_type="StudentCourseResult",
                              container_path="%s/study_course/%s" % (cp,level_id))
 first = []
@@ -82 +82 @@
     if row['credits'] and rd.grade:
         credits = int(course.credits)
-        sum += credits * (['F','E','D','C','B','A'].index(rd.grade) + 1)
+        sum += credits * ['F','E','D','C','B','A'].index(rd.grade)
         course_count += credits
     row['sum'] = sum
@@ -104 +104 @@
 if course_count:
     gpaf = (float(sum)/course_count)
-info['doc'].edit(mapping={'gpa': gpaf})
-gpa = "%4.2f" % gpaf 
-info['gpa'] = gpa
+gpa = "%4.2f" % gpaf
+info['doc'].edit(mapping={'gpa': gpa})
 info['first'] = first
 info['second'] = second