Changeset 2132 for WAeUP_SRP

Timestamp:

20 Aug 2007, 18:04:32 (17 years ago)

Author:

joachim

Message:

correct files for levels_voc, revert changes to getStudyLevelInfo

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getStudyCourseInfo.py (modified) (1 diff)
• getStudyLevelInfo.py (modified) (1 diff)
• get_levels_voc.py (added)

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -77 +77 @@
     row = {}
     row['id'] = l
-    row['title'] = "Level %s" % l
+    #row['title'] = "Level %s" % l
+    row['title'] = context.portal_vocabularies.levels_voc[l]
     row['url'] = "%s/%s" % (context.absolute_url(),l)
     items.append(row)

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -85 +85 @@
         info['status_info'] = "Courses validated"
 info['doc'] = context.getContent()
+##study_course = context.aq_parent.getContent()
+##cert_id = study_course.study_course
 cert_id = student.course
 info['cert_id'] = cert_id
-credits_total,carry_overs,normal = context.course_results.getCourses(student_id,context.getId())
+normal = []
+carry_overs = []
+credits_total = 0
+for id,obj in context.objectItems():
+    #try:
+    #    credit = int(obj.getContent().credits)
+    #except ValueError:
+    #    credit = 3
+    #credits_total += credit
+    if not id:
+        continue
+    if id.endswith('_co'):
+        d = context.getCourseInfo(id[:-3])
+        try:
+            credits_total += int(d['credits'])
+        except ValueError:
+            credits_total += 0
+        d['id'] = id
+        d['grade'] = obj.getContent().grade
+        carry_overs.append(d)
+    else:
+        d = context.getCourseInfo(id)
+        d['id'] = id
+        coe = getattr(obj.getContent(),'core_or_elective',True)
+        d['coe'] = 'Core'
+        try:
+            credits_total += int(d['credits'])
+        except ValueError:
+            credits_total += 0
+        if not coe:
+            d['coe'] = 'Elective'
+        normal.append(d)
 info['credits_total'] = credits_total
 info['credits_exceeded'] = credits_total > 51
 current_session = student.session
 info['submission_allowed']= not info['credits_exceeded'] and current_session == context.getSessionId()[-2:]
-# carry_overs.sort(cmp_semester_id)
+carry_overs.sort(cmp_semester_id)
 info['carry_overs'] = carry_overs
-# normal.sort(cmp_semester_id)
+normal.sort(cmp_semester_id)
 info['normal'] = normal